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

Merge 1.1.0 changelog to develop #4948

Merged
merged 7 commits into from
Oct 22, 2019

Conversation

emkll
Copy link
Contributor

@emkll emkll commented Oct 22, 2019

Status

Ready for review

Description of Changes

Towards #4887

Ports the RC and release commits (and changelog) to develop

Testing

  • Changelog should be accurate
  • All RC commits (and changelog commits) should be present

If you made non-trivial code changes:

  • I have written a test plan and validated it for this PR

kushaldas
kushaldas previously approved these changes Oct 22, 2019
Copy link
Contributor

@kushaldas kushaldas left a comment

Choose a reason for hiding this comment

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

This look good. Approved. 🏎️ to 1.2.0 👍

@redshiftzero
Copy link
Contributor

there's also e8e342f - skipping due to the diff being present here already?

@emkll emkll force-pushed the merge-1.1.0-changelog-to-develop branch 2 times, most recently from 0acafe0 to 8631ddb Compare October 22, 2019 13:26
emkll and others added 7 commits October 22, 2019 09:28
(cherry-picked from commit e8e342f)
(cherry picked from commit c44c00d)
(cherry picked from commit 5104f84)
(cherry picked from commit 1d8ac69)
(cherry picked from commit 4dec400)
(cherry picked from commit 22355cb)
@emkll emkll force-pushed the merge-1.1.0-changelog-to-develop branch from 8631ddb to 747b1c7 Compare October 22, 2019 13:30
@emkll
Copy link
Contributor Author

emkll commented Oct 22, 2019

good catch @redshiftzero , added that commit, should now be fixed

Copy link
Contributor

@redshiftzero redshiftzero left a comment

Choose a reason for hiding this comment

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

thanks! diff lgtm, good to merge once CI passes

@redshiftzero redshiftzero merged commit f555080 into develop Oct 22, 2019
@redshiftzero redshiftzero deleted the merge-1.1.0-changelog-to-develop branch October 22, 2019 15:05
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