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

Cherrypick #3941 "Correctly stop the timer used in the remote write path." #3950

Merged
merged 4 commits into from
Mar 13, 2018
Merged

Cherrypick #3941 "Correctly stop the timer used in the remote write path." #3950

merged 4 commits into from
Mar 13, 2018

Conversation

tomwilkie
Copy link
Member

@tomwilkie tomwilkie commented Mar 13, 2018 •
edited
Loading

See #3941

@fabxc
Copy link
Contributor

fabxc commented Mar 13, 2018 •
edited
Loading

👍 Squash it this time.

@brian-brazil
Copy link
Contributor

We should keep the commits the same across the two branches, otherwise it'll be annoying to work with.

@tomwilkie tomwilkie merged commit d8cfd8f into release-2.2 Mar 13, 2018
@tomwilkie tomwilkie deleted the cherrypick-3941 branch March 13, 2018 13:38
sipian pushed a commit to sipian/prometheus that referenced this pull request May 18, 2018
@tomwilkie
Merge pull request prometheus#3950 from prometheus/cherrypick-3941
606313b 
Cherrypick prometheus#3941 "Correctly stop the timer used in the remote write path."
Signed-off-by: sipian <cs15btech11019@iith.ac.in>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tomwilkie @fabxc @brian-brazil