Merge branch 'dev1' of https://github.com/MabOneSdk/azure-powershell into dev1

dragonfly91 · dragonfly91 · commit a2ee1aa2f9a2 · 2015-08-04T18:28:04.000+05:30
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Item/Disable-AzureBackupProtection .cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Item/Disable-AzureBackupProtection .cs
@@ -72,7 +72,7 @@ public override void ExecuteCmdlet()
 
 
                 WriteDebug("Received disable azure backup protection response");
-                var operationStatus = GetOperationStatus(operationId);
+                var operationStatus = TrackOperation(operationId);
                 this.WriteObject(GetCreatedJobs(new Models.AzurePSBackupVault(Item.ResourceGroupName, Item.ResourceName, Item.Location), operationStatus.JobList).FirstOrDefault());
             });
         }
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Item/Enable-AzureBackupProtection .cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Item/Enable-AzureBackupProtection .cs
@@ -74,7 +74,7 @@ public override void ExecuteCmdlet()
                 var operationId = AzureBackupClient.EnableProtection(Item.ContainerUniqueName, itemName, input);
                 WriteDebug("Received enable azure backup protection response");
 
-                var operationStatus = GetOperationStatus(operationId);
+                var operationStatus = TrackOperation(operationId);
                 this.WriteObject(GetCreatedJobs(new Models.AzurePSBackupVault(Item.ResourceGroupName, Item.ResourceName, Item.Location), operationStatus.JobList).FirstOrDefault());
             });
         }

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public override void ExecuteCmdlet()`
`72`	`72`
`73`	`73`
`74`	`74`	`WriteDebug("Received disable azure backup protection response");`
`75`		`- var operationStatus = GetOperationStatus(operationId);`
	`75`	`+ var operationStatus = TrackOperation(operationId);`
`76`	`76`	`this.WriteObject(GetCreatedJobs(new Models.AzurePSBackupVault(Item.ResourceGroupName, Item.ResourceName, Item.Location), operationStatus.JobList).FirstOrDefault());`
`77`	`77`	`});`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public override void ExecuteCmdlet()`
`74`	`74`	`var operationId = AzureBackupClient.EnableProtection(Item.ContainerUniqueName, itemName, input);`
`75`	`75`	`WriteDebug("Received enable azure backup protection response");`
`76`	`76`
`77`		`- var operationStatus = GetOperationStatus(operationId);`
	`77`	`+ var operationStatus = TrackOperation(operationId);`
`78`	`78`	`this.WriteObject(GetCreatedJobs(new Models.AzurePSBackupVault(Item.ResourceGroupName, Item.ResourceName, Item.Location), operationStatus.JobList).FirstOrDefault());`
`79`	`79`	`});`
`80`	`80`	`}`