Skip to content

Commit 1aa55bd

Browse files
committed
Merge branch 'dev1' of https://github.com/MabOneSdk/azure-powershell into dev1
2 parents 256ab43 + e20de1d commit 1aa55bd

File tree

5 files changed

+19
-11
lines changed

5 files changed

+19
-11
lines changed

src/ResourceManager/RecoveryServices.Backup/AzureRM.RecoveryServices.Backup.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ CLRVersion='4.0'
4545
ProcessorArchitecture = 'None'
4646

4747
# Modules that must be imported into the global environment prior to importing this module
48-
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.6'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.7'})
4949

5050
# Assemblies that must be loaded prior to importing this module
5151
RequiredAssemblies = @()

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Utils.cs

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
1-
using System;
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
using System;
216
using System.Collections.Generic;
317
using System.Linq;
418
using System.Text;

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/RecoveryPointsAPIs.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,8 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterN
2424
public partial class HydraAdapter
2525
{
2626
/// <summary>
27-
///
27+
/// Fetch the details of given Recovery point
2828
/// </summary>
29-
/// <param name="resourceGroupName"></param>
30-
/// <param name="resourceName"></param>
3129
/// <param name="containerName"></param>
3230
/// <param name="protectedItemName"></param>
3331
/// <param name="recoveryPointId"></param>
@@ -44,7 +42,7 @@ public RecoveryPointResponse GetRecoveryPointDetails(string containerName, strin
4442
}
4543

4644
/// <summary>
47-
///
45+
/// Fetch the Recovery points of protectedItem which satisfy specified query
4846
/// </summary>
4947
/// <param name="resourceGroupName"></param>
5048
/// <param name="resourceName"></param>

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/RestoreDiskAPIs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterN
1212
public partial class HydraAdapter
1313
{
1414
/// <summary>
15-
///
15+
/// Restore the given Recovery point of protectedItem to given storage account
1616
/// </summary>
1717
/// <param name="resourceGroupName"></param>
1818
/// <param name="resourceName"></param>

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/AzureVmModels/AzureRmRecoveryServicesAzureVmRecoveryPoint.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,5 @@ public AzureRmRecoveryServicesBackupIaasVmRecoveryPoint()
3434
{
3535

3636
}
37-
public override void Validate()
38-
{
39-
base.Validate();
40-
}
4137
}
4238
}

0 commit comments

Comments
 (0)