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.

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

Cut release 1.3.0 #2144

Merged
merged 1 commit into from
Nov 1, 2016
Merged

Cut release 1.3.0 #2144

merged 1 commit into from
Nov 1, 2016

Conversation

fabxc
Copy link
Contributor

@fabxc fabxc commented Nov 1, 2016

@fabxc fabxc changed the base branch from master to release-1.3 November 1, 2016 14:45
@brancz
Copy link
Member

brancz commented Nov 1, 2016

lgtm 👍 let's get it out there

@beorn7
Copy link
Member

beorn7 commented Nov 1, 2016

Can we have #2143 in there to fix that nasty bug?

@beorn7
Copy link
Member

beorn7 commented Nov 1, 2016

i.e. you can still trigger the same panic with a negative staleness delta on the command line, and there might be other paths to the range query that would still allow the inverted time range.

@fabxc
Copy link
Contributor Author

fabxc commented Nov 1, 2016

#2143 is in there, see last line in changelog.
I merged that back into master without PR as we obviously want it in there anyway.

@beorn7
Copy link
Member

beorn7 commented Nov 1, 2016

You merged #2142 but not #2143, which contains the "proper" fix.

@fabxc
Copy link
Contributor Author

fabxc commented Nov 1, 2016

Ah, I didn't even see that one, thanks. I'll blame it on the jetlag :)

@fabxc
Copy link
Contributor Author

fabxc commented Nov 1, 2016

@beorn7 your PR is merged, changes merged back into master and release-1.3 respectively.

@@ -9,6 +9,7 @@ This is a breaking change to the Kubernetes service discovery.
* [ENHANCEMENT] Add Azure SD metrics.
* [ENHANCEMENT] Add fuzzy search to `/graph` textarea.
* [ENHANCEMENT] Always show instance labels on target page.
* [BUGFIX] Validate query end time is not before start time.
Copy link
Member

Choose a reason for hiding this comment

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

Perhaps add that negative staleness deltas are now rejected when provided no the command line? (In principle, somebody might have done so, and now the server wouldn't start up anymore.)

@beorn7
Copy link
Member

beorn7 commented Nov 1, 2016

Thanks. Just one comment about the changelog.

@fabxc
Copy link
Contributor Author

fabxc commented Nov 1, 2016

Theoretically a breaking change – but as it caused the server to panic, categorizing it as bug fix seems fine.

@beorn7
Copy link
Member

beorn7 commented Nov 1, 2016

Exactly.

👍

@fabxc fabxc merged commit 18254a1 into release-1.3 Nov 1, 2016
@fabxc fabxc deleted the cut-1.3.0 branch November 1, 2016 16:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants