[Storage] Add the change on preview branch #11474
Merged
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
blueww
changed the title
erich-wang
previously approved these changes
Apr 3, 2020
Member
erich-wang
left a comment
erich-wang
left a comment
There was a problem hiding this comment.
Sign off with minor comments, @blueww please address them, thanks.
Member
There was a problem hiding this comment.
It seems this file should be under folder Az.Storage instead of Az.SignalR
Member
Author
There was a problem hiding this comment.
I just compared tools folder, and add the missing chnage.
This is from maddieclayton in commit 4344a98
Anyway, the path not exist any more, I can try to remove it.
But if remove it cause any issue, should wee it back.
Comment on lines
59
to
60
Member
There was a problem hiding this comment.
Please remove c:\workspace\powershell\src\Package\Debug\ResourceManager\AzureResourceManager\Az.Storage
Comment on lines
5
to
13
Member
There was a problem hiding this comment.
Please remove c:\zd\azure-powershell\artifacts\Debug
blueww
force-pushed
the
Az.Storage-preview-v2
branch
from
0a9c49a to
d323550
Compare
Member
|
/azp run |
8 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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
This PR is to merge the change on storage preview branch to the new preview branch create from master branch.
We need to do this since the master branch is rebased, all commit IDs are changes, so merge the master branch to storage preview branch have a lot of conflict.
I have added following changes:
@dingmeng-xue , @msJinLei
Would you please help to check if anything still missing?
It would be better if you can help to build the signed module from the branch, and I can test it. (We just need to release preview module from this on 4/10.)
Checklist
CONTRIBUTING.mdChangeLog.mdfile(s) has been updated:ChangeLog.mdfile can be found atsrc/{{SERVICE}}/{{SERVICE}}/ChangeLog.md## Upcoming Releaseheader -- no new version header should be added