diff --git a/CHANGELOG.md b/CHANGELOG.md index faccd3d28..14ae670f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ ## Unreleased +## 1.13.1 / 2022-11-01 + +* [BUGFIX] Fix race condition with Exemplar in Counter. #1146 +* [BUGFIX] Fix `CumulativeCount` value of `+Inf` bucket created from exemplar. #1148 +* [BUGFIX] Fix double-counting bug in `promhttp.InstrumentRoundTripperCounter`. #1118 + ## 1.13.0 / 2022-08-05 * [CHANGE] Minimum required Go version is now 1.17 (we also test client_golang against new 1.19 version). diff --git a/README.md b/README.md index 40c61468e..ab2653dd1 100644 --- a/README.md +++ b/README.md @@ -69,3 +69,24 @@ See the [contributing guidelines](CONTRIBUTING.md) and the [Community section](http://prometheus.io/community/) of the homepage. `clint_golang` community is also present on the CNCF Slack `#prometheus-client_golang`. + +### For Maintainers: Release Process + +To cut a minor version: + +1. Create a new branch `release-.` on top of the `main` commit you want to cut the version from and push it. +2. Create a new branch on top of the release branch, e.g. `/cut-..`, +3. Change the `VERSION` file. +4. Update `CHANGELOG` (only user-impacting changes to mention). +5. Create PR, and get it reviewed. +6. Once merged, create a release with the `release-.` tag on GitHub with the ` / ` title. +7. Announce on the prometheus-announce mailing list, slack and Twitter. +8. Merge the release branch back to the `main` using the "merge without squashing" approach (!). + +> NOTE: In case of merge conflicts, you can checkout the release branch in a new branch, e.g. /resolve-conflicts`, fix the merge problems there, and then do a PR into main from the new branch. In that way, you still get all the commits in the release branch back into `main`, but leave the release branch alone. + +To cut the patch version: + +1. Create a branch on top of the release branch you want to use. +2. Cherry-pick the fixes from the `main` branch (or add new commits) to fix critical bugs for that patch release. +3. Follow steps 3-8 as above. diff --git a/VERSION b/VERSION index feaae22ba..b50dd27dd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.13.0 +1.13.1