Skip to content

Fix merging problem in ChangeLog.md #10212

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 2 commits into from
Oct 9, 2019
Merged

Conversation

isra-fel
Copy link
Member

@isra-fel isra-fel commented Oct 8, 2019

Description

After #10074 was merged, #10057 should have updated ChangeLog.md but it didn't, so I'm doing it right now.

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

After #10074 was merged, #10057 should have updated `ChangeLog.md` but it didn't, so I'm doing it right now.
@adxsdkps
Copy link
Collaborator

adxsdkps commented Oct 8, 2019

Can one of the admins verify this patch?

@isra-fel isra-fel changed the title Fix merging problem caused by #10057 & #10074 Fix merging problem in ChangeLog.md Oct 8, 2019
@isra-fel
Copy link
Member Author

isra-fel commented Oct 8, 2019

@markcowl Hi Mark could you review this since you have the context? Thanks

@isra-fel
Copy link
Member Author

isra-fel commented Oct 9, 2019

/azp run azure-powershell - powershell-core

@azure-pipelines
Copy link
Contributor

Azure Pipelines successfully started running 1 pipeline(s).

@erich-wang erich-wang changed the base branch from master to release-2019-10-15 October 9, 2019 05:46
@msJinLei msJinLei merged commit 46bfdb9 into release-2019-10-15 Oct 9, 2019
@isra-fel isra-fel deleted the isra-fel-patch-2 branch October 9, 2019 08:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants