Commit Graph

66 Commits (7c039a6b3b4b2a9d7c613ac8bd3fc16e8ca79684)

Author SHA1 Message Date
tariqibrahim 1e4e4c46ba Merge branch 'master' of https://github.com/prometheus/prometheus into update_k8s
6 years ago
Erik Hollensbe b94eea482c discovery/gce: oauth2.NoContext is deprecated, replace with context.Background() (#5024)
6 years ago
tariqibrahim b883f6826b updating k8s.io/api to v1.13.1
6 years ago
Krasi Georgiev 26a360341a
update tsdb to 0.3.1 (#4997)
6 years ago
tariqibrahim 8264d41ebf Merge branch 'master' of https://github.com/prometheus/prometheus into update_k8s
6 years ago
tariqibrahim 1fd438ed2b rebase and resolve merge conflicts
6 years ago
Krasi Georgiev 7fc501d983
update tsdb to version v0.3.0 (#4953)
6 years ago
Simon Pasquier ac9d5f3d53
cmd/prometheus: replace glog by glog-gokit (#4931)
6 years ago
tariqibrahim 412ca33226 update kubernetes deps to v1.13.0
6 years ago
tariqibrahim e4222b1223 update client-go to v9.0.0 and other k8s deps to v1.12.3
6 years ago
Alex Yu 5dcce32ef8 update promlog to latest version (#4876)
6 years ago
Simon Pasquier ed19373a78
*: remove use of golang.org/x/net/context (#4869)
6 years ago
Ganesh Vernekar ca93fd544b /api/v1/labels endpoint for getting all label names (#4835)
6 years ago
Simon Pasquier 790876da60 go get honnef.co/go/tools/cmd/staticcheck in a temp dir
6 years ago
Simon Pasquier c141833d45 *: use staticcheck@next to support Go modules
6 years ago
Simon Pasquier c706b416bd vendor: run 'go mod vendor' from scratch
6 years ago