Skip to content
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

Update changelog #55882

Merged
merged 1 commit into from
Jan 27, 2020
Merged

Update changelog #55882

merged 1 commit into from
Jan 27, 2020

Conversation

waynew
Copy link
Contributor

@waynew waynew commented Jan 16, 2020

Added all relevant changes from the PRs that were merge to master.

Only 457 to review 😂 😩

@waynew waynew requested a review from a team as a code owner January 16, 2020 04:09
@ghost ghost requested a review from Ch3LL January 16, 2020 04:09
CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
@waynew waynew added the ZRELEASED - Neon retired label label Jan 16, 2020
CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Show resolved Hide resolved
@waynew waynew force-pushed the update-changelog branch 2 times, most recently from d199687 to 2880879 Compare January 22, 2020 17:59
- Add all PRs/issues to CHANGELOG.md
- Add gitattributes merge=union for CHANGELOG.md

    This should avoid most merge conflicts

- Try merge=union for release notes
- Remove dupes from changelog
- Update credits and add chroot to releasenotes
- Remove bad releasenotes info

    As a result of porting to master there were extra bits of information
    that got in before the actual changes. These have been removed.
@dwoz dwoz merged commit de5afe0 into saltstack:master Jan 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ZRELEASED - Neon retired label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants