Skip to content

Storage 1.13.4-preview #11487

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

Conversation

dingmeng-xue
Copy link
Member

Description

Checklist

  • I have read the Submitting Changes section of CONTRIBUTING.md
  • The title of the PR is clear and informative
  • The appropriate ChangeLog.md file(s) has been updated:
    • For any service, the ChangeLog.md file can be found at src/{{SERVICE}}/{{SERVICE}}/ChangeLog.md
    • A snippet outlining the change(s) made in the PR should be written under the ## Upcoming Release header -- no new version header should be added
  • The PR does not introduce breaking changes
  • If applicable, the changes made in the PR have proper test coverage
  • For public API changes to cmdlets:
    • a cmdlet design review was approved for the changes in this repository (Microsoft internal only)
    • the markdown help files have been regenerated using the commands listed here

@dingmeng-xue dingmeng-xue requested a review from blueww April 3, 2020 07:32
@adxsdkps
Copy link
Collaborator

adxsdkps commented Apr 3, 2020

Can one of the admins verify this patch?

Copy link
Member

@blueww blueww left a comment

Choose a reason for hiding this comment

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

The 2 json files should not be merged on preview branch.

@dingmeng-xue
Copy link
Member Author

The 2 json files should not be merged on preview branch.

Can they be merged? Is there any risk? I hope to minimize manual work.

@blueww
Copy link
Member

blueww commented Apr 3, 2020

They can't be merged since:

  1. They will take so many conflicts when merge master change back to preview branch
  2. They are for breaking change tracking, and we don't need to track breaking change on preview branch.

How about revise the automatic process by : when the build version has preview tag, skip update the 2 files.

@dingmeng-xue
Copy link
Member Author

They can't be merged since:

  1. They will take so many conflicts when merge master change back to preview branch
  2. They are for breaking change tracking, and we don't need to track breaking change on preview branch.

Got it. What I am thinking is on preview branch you can ignore those 2 files in code review. If so, 1 and 2 both won't be impact if you don't care about them. I'm learning the practice. Let's discuss again when PR is ready for review.

@blueww
Copy link
Member

blueww commented Apr 3, 2020

Actually, #1 will take a lot of trouble when I try to merge the latest change from master to preview branch.
And #2 will also has trouble when there's breaking change on preview branch, we need to add unnecessary static analysis exception,

@dingmeng-xue dingmeng-xue marked this pull request as ready for review April 7, 2020 07:48
@dingmeng-xue dingmeng-xue changed the title Update version to 1.13.4 Storage 1.13.4-preview Apr 7, 2020
Copy link
Member

@blueww blueww left a comment

Choose a reason for hiding this comment

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

We should not merge the 2 Json file, Dingmeng and I have a discussion, and finally both agreed not merge them.

@dingmeng-xue dingmeng-xue merged commit bfcd434 into Azure:Az.Storage-preview-v2 Apr 10, 2020
@dingmeng-xue dingmeng-xue deleted the Az.Storage-preview-v2 branch May 18, 2020 09:39
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.

3 participants