Skip to content

[Release 3.5.0] Merge master --> dev #3496

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 3 commits into from
Feb 14, 2017
Merged

Conversation

cormacpayne
Copy link
Member

Removing pull request template as this is a step in the release process.

Merge the master branch back into dev. Using my fork since there were merge conflicts merging Azure/master into Azure/dev

* Update Compute client library version to 14.0.0 and re-generate Powershell code with DiskRP support

* Fix VM output issue when AvailabilitySet is set with Compact display mode

* Update VM helper cmdlets to support Managed disk

* Update New-AzureRmAvailabilitySet and Get-AzureRmAvailabilitySet to support Managed disk

* Update change log for Compute

* WORK: PS test for Images

* WORK: add images PS tests

* Fix tab space

* Adding test for ConvertTo-AzureRmVMManagedDisk

* Fix tab spacing

* Change CreationDataCreateOption to CreateOption

* Add Update-AzureRmAvailabilitySet cmdlet

* Add SourceVaultId to Key encryption key commands

* Add Access and DurationIdSecond to Grant Access cmdlets

* Add StorageAccountType to Add-AzureRmVmssDataDisk and rename ManagedDiskStorageAccountType to StorageAccountType

* Update image tests.

* Update the markdown and help files.

* disk tests

* Powershell tests for VMSS with managed disks

* update compute test proj file to include any recorded files.

* adding disk tests

* adding disk and snapshot test

* records

* session records

* Add TestVirtualMachine_Managed test.

* Add session record files.

* Add more validation for disk rp tests.

* Remove tabs in VirtualMachineTests.ps1 file

* Add Remove-AzureRmDataDisk test

* Add Set-AzureRmDiskImage and Set-AzureRmSnapshotImage to the tests

* Add Update-AzureRmImage cmdlet and set alias Name for ImageName parameter.

* Update help and markdown files.

* Revert auto-generated cmdlets to manually written cmdlets.

* Add ShouldProcess support to Update, Grant, Revoke, Start, Restart cmdlets

* Add ShouldProcess support to config cmdlets

* Updating Remove-AzureRmVmssExtension cmdlet back to previous.

* Remove Get-AzureRmContainerServiceListNext because it is included Get-AzureRmContainerService

* Adding Add-AzureRmVmssDataDisk and Remove-AzureRmVmssDataDisk

* Update help and markdown files.

* Update the order of the paramters not to break existing ones.

* Update the markdown file.

* Limit the max number of position value to 3 for new cmdlets.

* Suppress breaking change exceptions.

* Update module version for Compute

* Suppress exceptions for sign job
…master-fix

# Conflicts:
#	src/ResourceManager/Compute/Commands.Compute/Microsoft.Azure.Commands.Compute.dll-Help.xml
#	tools/StaticAnalysis/Exceptions/BreakingChangeIssues.csv
…master-fix

# Conflicts:
#	tools/StaticAnalysis/Exceptions/BreakingChangeIssues.csv
@cormacpayne cormacpayne merged commit 7bb65be into Azure:dev Feb 14, 2017
@cormacpayne cormacpayne deleted the master-fix branch May 8, 2017 16:43
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.

2 participants