Skip to content

Commit b7e0167

Browse files
authored
Merge pull request #335 from prometheus/beorn7/release
Cut v1.2.0
2 parents cdc351c + b6262e5 commit b7e0167

34 files changed

+1692
-453
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.2.0 / 2020-03-11
2+
3+
* [FEATURE] Add an HTTP API to query pushed metrics and runtime information. #184
4+
15
## 1.1.0 / 2020-01-27
26

37
* [FEATURE] Add flag `--push.disable-consistency-check`. #318

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.0
1+
1.2.0

go.mod

+5-6
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@ module github.com/prometheus/pushgateway
22

33
require (
44
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
5-
github.com/go-kit/kit v0.9.0
6-
github.com/go-logfmt/logfmt v0.5.0 // indirect
7-
github.com/golang/protobuf v1.3.2
5+
github.com/go-kit/kit v0.10.0
6+
github.com/golang/protobuf v1.3.4
87
github.com/julienschmidt/httprouter v1.3.0 // indirect
98
github.com/matttproud/golang_protobuf_extensions v1.0.1
109
github.com/pkg/errors v0.9.1 // indirect
11-
github.com/prometheus/client_golang v1.3.0
10+
github.com/prometheus/client_golang v1.5.0
1211
github.com/prometheus/client_model v0.2.0
1312
github.com/prometheus/common v0.9.1
13+
github.com/prometheus/procfs v0.0.10 // indirect
1414
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
1515
github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd
16-
golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9 // indirect
17-
golang.org/x/tools v0.0.0-20190919031856-7460b8e10b7e // indirect
16+
golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 // indirect
1817
gopkg.in/alecthomas/kingpin.v2 v2.2.6
1918
)
2019

go.sum

+295-4
Large diffs are not rendered by default.

vendor/github.com/go-kit/kit/log/json_logger.go

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang/protobuf/proto/lib.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang/protobuf/proto/text.go

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang/protobuf/ptypes/any/any.pb.go

+5-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang/protobuf/ptypes/any/any.proto

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang/protobuf/ptypes/duration/duration.proto

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go

+23-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.proto

+20-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/prometheus/client_golang/prometheus/counter.go

+45-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)