Skip to content

Merging Release-0.9.7 with master #762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 279 commits into from
Aug 17, 2015
Merged

Merging Release-0.9.7 with master #762

merged 279 commits into from
Aug 17, 2015

Conversation

markcowl
Copy link
Member

No description provided.

EmmaZhu added 30 commits May 8, 2015 14:22
…filesas

Conflicts:
	src/ServiceManagement/HDInsight/Commands.HDInsight/packages.config
…shell-pr into sprint51

Conflicts:
	src/Common/Commands.Common.Storage/WindowsAzureSubscriptionExtensions.cs
	src/Common/Commands.Common.Test/Commands.Common.Test.csproj
	src/Common/Commands.Common/packages.config
	src/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj
	src/ResourceManager/Resources/Commands.Resources.Test/packages.config
	src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj
	src/ServiceManagement/Compute/Sync/packages.config
	src/ServiceManagement/HDInsight/Commands.HDInsight.Test/packages.config
	src/ServiceManagement/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj
	src/ServiceManagement/HDInsight/Commands.HDInsight/packages.config
	src/ServiceManagement/ManagedCache/Commands.ManagedCache/packages.config
	src/ServiceManagement/Network/Commands.Network.Test/packages.config
	src/ServiceManagement/Network/Commands.Network/Commands.ServiceManagement.Network.csproj
	src/ServiceManagement/Network/Commands.Network/packages.config
	src/ServiceManagement/Sql/Commands.SqlDatabase/packages.config
	src/ServiceManagement/Storage/Commands.Storage.StorageTestLib/Commands.Storage.StorageTestLib.csproj
	src/ServiceManagement/Storage/Commands.Storage.StorageTestLib/packages.config
	src/ServiceManagement/Storage/Commands.Storage/Blob/Cmdlet/StartAzureStorageBlobCopy.cs
	src/ServiceManagement/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageContext.cs
	src/ServiceManagement/Storage/Commands.Storage/Common/StorageCloudCmdletBase.cs
	src/ServiceManagement/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.xml
	src/ServiceManagement/Storage/Commands.Storage/Resources.Designer.cs
	src/ServiceManagement/Storage/Commands.Storage/Resources.resx
	src/lib/Microsoft.WindowsAzure.Storage.DataMovement.dll
… into sprint51

Conflicts:
	src/ServiceManagement/RemoteApp/Commands.RemoteApp.Test/Commands.RemoteApp.Test.csproj
	src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj
markcowl and others added 25 commits August 11, 2015 16:38
Moving DSC common classes into service management library, also skipp…
RemoteApp: RestartVm teanat admin cmdlet
Renaming batch commands directory
markcowl added a commit that referenced this pull request Aug 17, 2015
Merging Release-0.9.7 with master
@markcowl markcowl merged commit 4771d95 into Azure:master Aug 17, 2015
@markcowl markcowl deleted the 097master branch August 24, 2018 01:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.