Update CHANGELOG in preparation for 2.2.0 release #228
Conversation
dmagliola
force-pushed
the
update_changelog_2_2_0
branch
from
8961083
to
8e21805
Compare
Includes the changes in `master` that we'll release in `2.2.0`, and the ones that we can't because of breaking changes, which we'll release in `3.0.0` Signed-off-by: Daniel Magliola <dmagliola@crystalgears.com>
dmagliola
force-pushed
the
update_changelog_2_2_0
branch
from
8e21805
to
3743172
Compare
|
Changelog looks good. I'll add the other pushgateway changes to it when I get a moment to do them. I think there might be some commits missing from the branch though? At the very least I'd expect to see all three from this PR once it's merged. Haven't looked through the others, but I wanted to check how you chose which commits to cherry pick before I do. |
Well, yes, but it's not merged, so they may change :D My question is whether the way the branch is set up / the general approach is how you'd do it.
Everything in |
|
Alright, settled in enough at the new job to have time to think about this again. The general approach looks right. I would say it's worth grabbing the readme changes too, if it's not a huge faff, to avoid any confusion when viewing the release on GitHub. |
Sinjo
changed the title
Sinjo
changed the title
|
I've included the commit from this branch in #244, and added the other changes needed now that we're going straight to a 3.0.0 release. |
Includes the changes in
masterthat we'll release in2.2.0, andthe ones that we can't because of breaking changes, which we'll release
in
3.0.0I'm proposing to release a new version with the bug fixes and backwards-compatible improvements we've introduced (which we should have released ages ago, but life), including the not-yet-merged fix to
with_labelsin #227.Since
masterhas many non-releasable changes, I've created branchv2.2_release, which forks off of2.1.0and has the relevant commits cherry-picked into it.Comparison between 2.2.0 (cherry-picked commits) vs 2.1.0
Once we finish the changes to PushGateway, we'll release v3.0 with what's in
masterright now.NOTE: Do not merge this yet. If @Sinjo agrees with this approach, I'll update this README with the correct, date, merge, and add a new release tag in the
v2.2_releasebranch