Skip to content

Conversation

@huangpf
Copy link
Owner

@huangpf huangpf commented Sep 14, 2015

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
PR from parent branch
Conflicts:
	src/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj
	src/Common/Commands.ScenarioTest/packages.config
xindzhan and others added 27 commits September 4, 2015 14:57
Integrate Application Insights into Azure PowerShell
Add wix file for AI dll
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
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
[Release 0.9.8] Merge master into dev
huangpf added a commit that referenced this pull request Sep 14, 2015
@huangpf huangpf merged commit d7a961c into huangpf:dev Sep 14, 2015
huangpf added a commit that referenced this pull request Dec 16, 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.

9 participants