Revert "config: remove support for JSON marshaling (#2086)"#2133
Merged
simonpasquier merged 1 commit intoprometheus:release-0.20from Dec 6, 2019
Merged
Revert "config: remove support for JSON marshaling (#2086)"#2133simonpasquier merged 1 commit intoprometheus:release-0.20from
simonpasquier merged 1 commit intoprometheus:release-0.20from
Conversation
This reverts commit 918f08b. Signed-off-by: Simon Pasquier <spasquie@redhat.com>
stuartnelson3
approved these changes
Dec 6, 2019
simonpasquier
added a commit
that referenced
this pull request
Dec 12, 2019
* Revert "slack: retry 429 errors (#2112)" (#2128) This reverts commit 26cc96a. Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Revert "config: remove support for JSON marshaling (#2086)" (#2133) This reverts commit 918f08b. Signed-off-by: Simon Pasquier <spasquie@redhat.com> * config: fix JSON unmarshaling for HostPort (#2134) Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Cut 0.20.0 (#2137) Signed-off-by: Simon Pasquier <spasquie@redhat.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Relates to #2129
This reverts commit 918f08b.