Skip to content

config: remove support for JSON marshaling#2086

Merged
simonpasquier merged 1 commit intoprometheus:masterfrom
simonpasquier:remove-json-unmarshal-support
Oct 29, 2019
Merged

config: remove support for JSON marshaling#2086
simonpasquier merged 1 commit intoprometheus:masterfrom
simonpasquier:remove-json-unmarshal-support

Conversation

@simonpasquier
Copy link
Member

I might be wrong but I think that JSON marshaling is a left-over from older Alertmanager versions.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@simonpasquier simonpasquier merged commit 918f08b into prometheus:master Oct 29, 2019
@simonpasquier simonpasquier deleted the remove-json-unmarshal-support branch October 29, 2019 09:46
simonpasquier added a commit to simonpasquier/alertmanager that referenced this pull request Dec 6, 2019
This reverts commit 918f08b.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
simonpasquier added a commit that referenced this pull request Dec 6, 2019
This reverts commit 918f08b.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
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>
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.

2 participants