Pull in the latest from preview into websites-preview #5592
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…RmAccount as Disconnect-AzureRmAccount
…nto use-connect-and-disconnect-verbs
…nto use-connect-and-disconnect-verbs # Conflicts: # src/ResourceManager/Profile/AzureRM.Profile.Netcore.psd1 # src/ResourceManager/Profile/AzureRM.Profile.psd1 # src/ResourceManager/Profile/ChangeLog.md # tools/AzureRM/AzureRM.psm1 # tools/InstallationTests/NetcoreTests/NetcoreTests.ps1 # tools/StaticAnalysis/Exceptions/BreakingChangeIssues.csv
…hell into use-connect-and-disconnect-verbs # Conflicts: # src/ResourceManager/Profile/AzureRM.Profile.psd1 # src/ResourceManager/Profile/ChangeLog.md # src/ResourceManager/Profile/Commands.Profile/StartupScripts/AzureRmProfileStartup.ps1 # tools/StaticAnalysis/Exceptions/BreakingChangeIssues.csv
…nto use-connect-and-disconnect-verbs
…t-verbs Pull in the latest changes from Azure/preview
Replaced two uses of AddAzureRMAccountCommand with ConnectAzureRmAccountCommand.
…esource Improved NestedResource configuration
…nto release-5.1.0 # Conflicts: # src/ResourceManager/Compute/Commands.Compute/Strategies/Network/SubnetStrategy.cs
Update version of EventHub SDK used in EventGrid test project
Correct error in ResourceGroup Parameter Description
Update of Set-AzureRmVMOsDisk to support managed OS disk swap
Update EventHub SDK version used in IotHub tests
ServiceBus: Geo DR Updates
EventHubs: updated online version links in markdown files
EventGrid: Updated to use the latest version of the .NET SDK
…nto websites-preview # Conflicts: # src/ResourceManager/Websites/AzureRM.Websites.psd1 # src/ResourceManager/Websites/Commands.Websites/Properties/AssemblyInfo.cs # src/ResourceManager/Websites/WebSites.sln # tools/StaticAnalysis/Exceptions/BreakingChangeIssues.csv
…t for preview modules
…hell into websites-preview # Conflicts: # src/ServiceManagement/ServiceManagement.sln # tools/PublishModules.ps1
…zure#5471 for identity & httpsOnly property
|
@panchagnula Can you squash your commits? Thanks. |
13 tasks
|
@MiYanni we don't want to squash the commits in this PR. Sisira is pulling the latest commits from the |
|
@panchagnula My bad. Please don't squash these. I didn't realize it was a branch merge. |
cormacpayne
approved these changes
Feb 22, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Cormac's changes for integrating preview to websites-preview
Re-recording the RemoveWebApp test that got added rom stable
Adding the updates for setAzureWebapp from PR #5471
Checklist
CONTRIBUTING.mdplatyPSmodule