Merge pull request #57 from MabOneSdk/pragrawa

pragrawa · pragrawa · commit 316e8a40f4da · 2015-06-26T17:35:10.000+05:30
Policy Merge conflict
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/SetAzureBackupProtectionPolicy.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/SetAzureBackupProtectionPolicy.cs
@@ -95,7 +95,7 @@ public override void ExecuteCmdlet()
                     {
                         var operationStatus = GetOperationStatus(operationId);
                         WriteDebug("Protection Policy successfully updated and created job(s) to re-configure protection on associated items");
-                        WriteObject(operationStatus.JobList);                        
+                        WriteObject(operationStatus.Jobs);                        
                     }
 
                     else

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public override void ExecuteCmdlet()`
`95`	`95`	`{`
`96`	`96`	`var operationStatus = GetOperationStatus(operationId);`
`97`	`97`	`WriteDebug("Protection Policy successfully updated and created job(s) to re-configure protection on associated items");`
`98`		`- WriteObject(operationStatus.JobList);`
	`98`	`+ WriteObject(operationStatus.Jobs);`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`else`