Merge the 2.13 release branch #6169
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add the tsdb tool to promu so that it's included in the release tarballs. Signed-off-by: Ben Kochie <superq@gmail.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>
An extra sync.Pool was added during a refactor which caused some 64 bit, atomically accessed variables to no longer be 64 bit aligned. By moving all atomically accessed variables to the beginning of the struct they are guaranteed to be 64 bit aligned. Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
* cut 2.13.1 release (prometheus#6099) Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>
krasi-georgiev
force-pushed
the
release-merge
branch
from
43b5bba
to
9bf88cd
Compare
|
Hmm, I would just merge the prometheus:release-2.13 branch into prometheus:master. But here you are merging one of your own branches. |
|
I see, there are merge conflicts... |
|
I tried in #6167 , but there is was a merge conflict so needed to create another branch to resolve the conflict |
|
But why are there so many more commits in here? Let me try something... |
krasi-georgiev
force-pushed
the
release-merge
branch
from
9bf88cd
to
3a4e11e
Compare
|
fixed it I merged my local release branch and not origin/relase.... |
|
I see. Now your attempt and mine (#6171) look the same. 👍 here and I'll remove my own PR. |
… into release-merge Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>
krasi-georgiev
force-pushed
the
release-merge
branch
from
3a4e11e
to
7c16f54
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.