Merge branch 'dev' of https://github.com/dscsolutions/azure-powershell into dev

eshaparmar · eshaparmar · commit 9fae049aa607 · 2015-07-16T11:17:15.000-07:00
Conflicts:
	src/ResourceManager/Compute/Commands.Compute/Extension/DSC/PublishAzureVMDscConfigurationCommand.cs
	src/ResourceManager/Compute/Commands.Compute/Extension/DSC/SetAzureVMDscExtensionCommand.cs
	src/ResourceManager/Compute/Commands.Compute/Microsoft.Azure.Commands.Compute.dll-Help.xml
	src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/PublishAzureVMDscConfiguration.cs
	src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/SetAzureVMDscExtension.cs
	src/ServiceManagement/Compute/Commands.ServiceManagement/Microsoft.WindowsAzure.Commands.ServiceManagement.dll-Help.xml
diff --git a/src/ResourceManager/Compute/Commands.Compute/Extension/DSC/PublishAzureVMDscConfigurationCommand.cs b/src/ResourceManager/Compute/Commands.Compute/Extension/DSC/PublishAzureVMDscConfigurationCommand.cs
@@ -1,4 +1,4 @@
-﻿using Microsoft.Azure.Commands.Compute.Common;
+using Microsoft.Azure.Commands.Compute.Common;
 using Microsoft.Azure.Common.Authentication.Models;
 using Microsoft.WindowsAzure.Commands.Common.Extensions.DSC;
 using Microsoft.WindowsAzure.Commands.Common.Extensions.DSC.Publish;
@@ -153,3 +153,4 @@ public override void ExecuteCmdlet()
         }
     }
 }
+
diff --git a/src/ResourceManager/Compute/Commands.Compute/Extension/DSC/SetAzureVMDscExtensionCommand.cs b/src/ResourceManager/Compute/Commands.Compute/Extension/DSC/SetAzureVMDscExtensionCommand.cs
@@ -1,4 +1,4 @@
-﻿using AutoMapper;
+using AutoMapper;
 using Microsoft.Azure.Commands.Compute.Common;
 using Microsoft.Azure.Commands.Compute.Models;
 using Microsoft.Azure.Common.Authentication.Models;
@@ -435,3 +435,4 @@ private class ConfigurationUris
         }
     }
 }
+
diff --git a/src/ResourceManager/Compute/Commands.Compute/Microsoft.Azure.Commands.Compute.dll-Help.xml b/src/ResourceManager/Compute/Commands.Compute/Microsoft.Azure.Commands.Compute.dll-Help.xml
@@ -13040,4 +13040,4 @@ Set-AzureVMSourceImage -VM $vm -Name $img -DestinationVhdsContainer $vhdContaine
 	<maml:relatedLinks>
 	</maml:relatedLinks>
 </command:command>
-</helpItems>
+</helpItems>
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/PublishAzureVMDscConfiguration.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/PublishAzureVMDscConfiguration.cs
@@ -161,3 +161,4 @@ private void ExecuteCommand()
         }
     }
 }
+
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/SetAzureVMDscExtension.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/SetAzureVMDscExtension.cs
@@ -388,3 +388,4 @@ private void CreateConfiguration()
         }
     }
 }
+
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Microsoft.WindowsAzure.Commands.ServiceManagement.dll-Help.xml b/src/ServiceManagement/Compute/Commands.ServiceManagement/Microsoft.WindowsAzure.Commands.ServiceManagement.dll-Help.xml
@@ -35947,4 +35947,4 @@ Get-AzureVM -ServiceName service -Name vmName|  Set-AzureVMSqlServerExtension -D
 </command:command>
 
 
-</helpItems>
+</helpItems>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Microsoft.Azure.Commands.Compute.Common;`
	`1`	`+using Microsoft.Azure.Commands.Compute.Common;`
`2`	`2`	`using Microsoft.Azure.Common.Authentication.Models;`
`3`	`3`	`using Microsoft.WindowsAzure.Commands.Common.Extensions.DSC;`
`4`	`4`	`using Microsoft.WindowsAzure.Commands.Common.Extensions.DSC.Publish;`
`@@ -153,3 +153,4 @@ public override void ExecuteCmdlet()`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`	`}`
	`156`	`+`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using AutoMapper;`
	`1`	`+using AutoMapper;`
`2`	`2`	`using Microsoft.Azure.Commands.Compute.Common;`
`3`	`3`	`using Microsoft.Azure.Commands.Compute.Models;`
`4`	`4`	`using Microsoft.Azure.Common.Authentication.Models;`
`@@ -435,3 +435,4 @@ private class ConfigurationUris`
`435`	`435`	`}`
`436`	`436`	`}`
`437`	`437`	`}`
	`438`	`+`
Original file line number	Diff line number	Diff line change
`@@ -161,3 +161,4 @@ private void ExecuteCommand()`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`	`}`
	`164`	`+`
Original file line number	Diff line number	Diff line change
`@@ -388,3 +388,4 @@ private void CreateConfiguration()`
`388`	`388`	`}`
`389`	`389`	`}`
`390`	`390`	`}`
	`391`	`+`
Original file line number	Diff line number	Diff line change
`@@ -35947,4 +35947,4 @@ Get-AzureVM -ServiceName service -Name vmName\| Set-AzureVMSqlServerExtension -D`
`35947`	`35947`	`</command:command>`
`35948`	`35948`
`35949`	`35949`
`35950`		`-</helpItems>`
	`35950`	`+</helpItems>`