-
Notifications
You must be signed in to change notification settings - Fork 9k
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 the 2.13 release branch #6169
Merge the 2.13 release branch #6169
Conversation
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>
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... |
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>
3a4e11e
to
7c16f54
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Feel free to merge on green.
No description provided.