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.

Sign up for GitHub

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

Jump to bottom

Cut release 2.13.1 #6145

Merged
merged 5 commits into from Oct 17, 2019
Merged

Cut release 2.13.1 #6145

merged 5 commits into from Oct 17, 2019

Conversation

krasi-georgiev
Copy link
Contributor

No description provided.

@krasi-georgiev
cut 2.13 release (prometheus#6099)
ae802f5 
Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>
@krasi-georgiev
Merge remote-tracking branch 'origin/release-2.13' into release-2.13
2f6832b 
Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>
@krasi-georgiev
Cut 2.13.1 release
d114906 
Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>
beorn7
beorn7 approved these changes Oct 16, 2019
View reviewed changes
VERSION Outdated
2.13.1
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't this have a newline at the end? This one is the only VERSION file in any Prometheus project without a trailing newline.

Copy link
Member

Choose a reason for hiding this comment

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

I'm guessing it is an artifact of prometheus/promu#170

Copy link
Member

Choose a reason for hiding this comment

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

I'd suggest to fix it in promu bump then.

Copy link
Member

Choose a reason for hiding this comment

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

In progress though promu bump doesn't exist yet ;-)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

added the new line

beorn7
beorn7 requested changes Oct 16, 2019
View reviewed changes
Copy link
Member

@beorn7 beorn7 left a comment

Choose a reason for hiding this comment

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

Thinking about #6139 : Perhaps it will help to bump prometheus/client_golang to v1.2.0.

simonpasquier
simonpasquier approved these changes Oct 16, 2019
View reviewed changes
Copy link
Member

@simonpasquier simonpasquier left a comment

Choose a reason for hiding this comment

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

LGTM

@krasi-georgiev
add new line
8bba1d8 
Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>
@krasi-georgiev
Copy link
Contributor Author

Thinking about #6139 : Perhaps it will help to bump prometheus/client_golang to v1.2.0.

IIUC the patch release should add only include bug fixes introduced since the last version right?
Is this one of those or has been there before that?

@beorn7
Copy link
Member

beorn7 commented Oct 16, 2019

I'm not sure when the bug was introduced.
But I think all relevant bug fixes should make it into bug fix releases. That's what they are for. (So that users who want the bug fixes don't have to deal with non-bug-fix changes and their impact, which comes with minor and major releases.)

@krasi-georgiev
Copy link
Contributor Author

krasi-georgiev commented Oct 16, 2019 •
edited

But I think all relevant bug fixes should make it into bug fix releases. That's what they are for. (So that users who want the bug fixes don't have to deal with non-bug-fix changes and their impact, which comes with minor and major releases.)

true, true, but that means cutting a new patch release every week which I wouldn't have the time to do.

@beorn7
Copy link
Member

beorn7 commented Oct 16, 2019

But you are cutting a patch release right now. That's why I suggest to do the easy bump of client_golang to get a bugfix in, which might even fix #6139 . Low risk, low effort, nice potential benefit. And it avoids cutting another patch release next week.

@krasi-georgiev
Copy link
Contributor Author

@beorn7 sure no problem, updated.

@beorn7
Copy link
Member

beorn7 commented Oct 17, 2019

Many thanks.

But now it looks you need to run a go get and then go mod tidy and go mod vendor again.
(Or something like that, still getting into that module stuff.)

@krasi-georgiev
Copy link
Contributor Author

yep I did all of that and there is still some problem. Troubleshooting now.

@krasi-georgiev krasi-georgiev force-pushed the release-2.13 branch 2 times, most recently from 7640174 to 6afa303 Compare October 17, 2019 09:53
@krasi-georgiev
upgrade client_golang to v1.2.0
6f92ce5 
Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>
@krasi-georgiev
Copy link
Contributor Author

@beorn7 all good now, do you have any other comments?

beorn7
beorn7 approved these changes Oct 17, 2019
View reviewed changes
Copy link
Member

@beorn7 beorn7 left a comment

Choose a reason for hiding this comment

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

❤️

BTW, we are now using github.com/cespare/xxhash in v1 and v2 in parallel in the same program. That's one of the things that has been solved quite neatly with Go modules.

@krasi-georgiev krasi-georgiev merged commit b03bb38 into prometheus:release-2.13 Oct 17, 2019
@krasi-georgiev krasi-georgiev deleted the release-2.13 branch October 17, 2019 12:21
krasi-georgiev pushed a commit that referenced this pull request Oct 17, 2019
Merge the 2.13 release branch (#6169)
5b8ff9b 
* Include tsdb tool in builds (#6085) (#6089)

Add the tsdb tool to promu so that it's included in the release
tarballs.

Signed-off-by: Ben Kochie <superq@gmail.com>

* web/ui: fix for CVE-2019-10215 (#6098)

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* cut 2.13 release (#6099)

Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>

* Fix panic in ARM builds of Prometheus (#6110)

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>

* promql: fix potential panic in the query logger (#6094)

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Cut release 2.13.1 (#6145)

Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simonpasquier simonpasquier simonpasquier approved these changes

@beorn7 beorn7 beorn7 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@krasi-georgiev @beorn7 @simonpasquier