Merge branch 'dev1' into anudeeb-dev1

dragonfly91 · dragonfly91 · commit 17a50c6d6e98 · 2016-04-14T13:00:57.000+05:30
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesContainer.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesContainer.cs
@@ -46,7 +46,7 @@ public class GetAzureRmRecoveryServicesBackupContainer : RecoveryServicesBackupC
         [ValidateNotNullOrEmpty]
         public string ResourceGroupName { get; set; }
 
-        [Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Container.Status)]
+        [Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Container.Status)]
         [ValidateNotNullOrEmpty]
         public ContainerRegistrationStatus Status { get; set; }
 
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/UnregisterAzureRmRecoveryServicesBackupManagementServer.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/UnregisterAzureRmRecoveryServicesBackupManagementServer.cs
@@ -25,8 +25,8 @@
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Container
 {
-    [Cmdlet(VerbsLifecycle.Unregister, "AzureRmBackupManagementServer")]
-    public class UnregisterAzureRmBackupManagementServer : RecoveryServicesBackupCmdletBase
+    [Cmdlet(VerbsLifecycle.Unregister, "AzureRmRecoveryServicesBackupManagementServer")]
+    public class UnregisterAzureRmRecoveryServicesBackupManagementServer : RecoveryServicesBackupCmdletBase
     {
         [Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Container.RegisteredContainer)]
         [ValidateNotNullOrEmpty]
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Commands.RecoveryServices.Backup.Cmdlets.csproj b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Commands.RecoveryServices.Backup.Cmdlets.csproj
@@ -83,7 +83,7 @@
     <Compile Include="Cmdlets\Backup\BackupAzureRmRecoveryServicesItem.cs" />
     <Compile Include="Cmdlets\Container\GetAzureRmRecoveryServicesBackupManagementServer.cs" />
     <Compile Include="Cmdlets\Container\GetAzureRmRecoveryServicesContainer.cs" />
-    <Compile Include="Cmdlets\Container\UnregisterAzureRmBackupManagementServer.cs" />
+    <Compile Include="Cmdlets\Container\UnregisterAzureRmRecoveryServicesBackupManagementServer.cs" />
     <Compile Include="Cmdlets\Container\UnregisterAzureRmRecoveryServicesBackupContainer.cs" />
     <Compile Include="Cmdlets\Item\DisableAzureRmRecoveryServicesProtection.cs" />
     <Compile Include="Cmdlets\Item\EnableAzureRmRecoveryServicesProtection.cs" />

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@`
`25`	`25`
`26`	`26`	`namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Container`
`27`	`27`	`{`
`28`		`- [Cmdlet(VerbsLifecycle.Unregister, "AzureRmBackupManagementServer")]`
`29`		`- public class UnregisterAzureRmBackupManagementServer : RecoveryServicesBackupCmdletBase`
	`28`	`+ [Cmdlet(VerbsLifecycle.Unregister, "AzureRmRecoveryServicesBackupManagementServer")]`
	`29`	`+ public class UnregisterAzureRmRecoveryServicesBackupManagementServer : RecoveryServicesBackupCmdletBase`
`30`	`30`	`{`
`31`	`31`	`[Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Container.RegisteredContainer)]`
`32`	`32`	`[ValidateNotNullOrEmpty]`