Skip to content

[Release 0.9.8] Merge master into dev #897

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 137 commits into from
Sep 14, 2015
Merged

[Release 0.9.8] Merge master into dev #897

merged 137 commits into from
Sep 14, 2015

Conversation

jianghaolu
Copy link
Contributor

No description provided.

robertla and others added 30 commits April 10, 2015 13:25
…e again

Conflicts:
	src/ServiceManagement/RemoteApp/Commands.RemoteApp/SecurityPrincipals/GetAzureRemoteAppUser.cs
Conflicts:
	src/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj
	src/Common/Commands.ScenarioTest/packages.config
xindzhan and others added 24 commits September 4, 2015 14:57
Integrate Application Insights into Azure PowerShell
Fix storage test for QosEvent writeError
Fix for non-interactive scenario
Conflicts:
	src/AzurePowershell.sln
	src/Common/AzurePSCmdlet.cs
	src/Common/Commands.Common/Commands.Common.csproj
	src/ResourceManager/AzureBatch/Commands.Batch/Accounts/GetBatchAccountCommand.cs
	src/ResourceManager/AzureBatch/Commands.Batch/Accounts/GetBatchAccountKeysCommand.cs
	src/ResourceManager/AzureBatch/Commands.Batch/Accounts/NewBatchAccountCommand.cs
	src/ResourceManager/AzureBatch/Commands.Batch/Accounts/NewBatchAccountKeyCommand.cs
	src/ResourceManager/AzureBatch/Commands.Batch/Accounts/RemoveBatchAccountCommand.cs
	src/ResourceManager/AzureBatch/Commands.Batch/Accounts/SetBatchAccountCommand.cs
	src/ResourceManager/AzureBatch/Commands.Batch/Utils/Constants.cs
	src/ResourceManager/Compute/Commands.Compute/Common/ConstantStringTypes.cs
	src/ResourceManager/Compute/Commands.Compute/Properties/Resources.resx
	src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Config/NewAzureVMConfigCommand.cs
	src/ResourceManager/Resources/Commands.Resources.Test/ResourceGroups/GetAzureResourceGroupLogCommandTests.cs
	src/ResourceManager/Resources/Commands.Resources/ResourceGroups/GetAzureResourceGroupLogCommand.cs
Jianghao Lu added 3 commits September 13, 2015 15:03
Conflicts:
	src/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj
	src/Common/Commands.ResourceManager.Common/Properties/Resources.Designer.cs
	src/Common/Commands.ResourceManager.Common/Properties/Resources.resx
	src/ResourceManager.sln
jianghaolu pushed a commit that referenced this pull request Sep 14, 2015
[Release 0.9.8] Merge master into dev
@jianghaolu jianghaolu merged commit 261c997 into Azure:dev Sep 14, 2015
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.