Skip to content

Conversation

@EmmaZhu
Copy link
Member

@EmmaZhu EmmaZhu commented Nov 3, 2015

Add cmdlets to get/set storage file metrics
Fix behavior issue in Get-AzureStorageFile
Add cmdlets to check storage account name availability and get storage usage in a subscription.

EmmaZhu and others added 30 commits August 10, 2015 14:45
…nto SRP

Conflicts:
	src/ResourceManager/Storage/Commands.Management.Storage.Test/packages.config
…nto SRP

Conflicts:
	src/ResourceManager/Storage/Commands.Management.Storage.Test/packages.config
	src/ResourceManager/Storage/Commands.Management.Storage/StorageAccount/NewAzureStorageAccountKey.cs
	src/ResourceManager/Storage/Commands.Management.Storage/packages.config
…nto SRP

Conflicts:
	src/ResourceManager/Storage/Commands.Management.Storage/Microsoft.Azure.Commands.Management.Storage.dll-Help.xml
…nto SRP

Conflicts:
	src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.csproj
	src/ResourceManager/Storage/Commands.Management.Storage/Microsoft.Azure.Commands.Management.Storage.dll-Help.xml
	src/ResourceManager/Storage/Commands.Management.Storage/Models/PSStorageAccount.cs
	src/ResourceManager/Storage/Commands.Management.Storage/StorageAccount/GetAzureStorageAccount.cs
	src/ResourceManager/Storage/Commands.Management.Storage/packages.config
…hell into dev

Conflicts:
	src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/DscExtensionTests.ps1
	src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.DscExtensionTests/TestGetAzureRmVMDscExtension.json
…hell into sprint55

Conflicts:
	src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/ScenarioTests/Common.ps1
	src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/packages.config
	src/ResourceManager/ApiManagement/Commands.SMAPI.Test/packages.config
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@EmmaZhu There should be no changes here. Please checkout the original file from the upstream branch

@markcowl
Copy link
Member

markcowl commented Nov 3, 2015

@EmmaZhu
Copy link
Member Author

EmmaZhu commented Nov 3, 2015

@EmmaZhu
Copy link
Member Author

EmmaZhu commented Nov 3, 2015

markcowl added a commit that referenced this pull request Nov 3, 2015
Add cmdlets to get/set storage file metrics
@markcowl markcowl merged commit aa07ccc into Azure:release-1.0.0 Nov 3, 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.

4 participants