Skip to content

Commit 117160a

Browse files
authored
Merge pull request kubernetes#76559 from liggitt/bump-prometheus
bump github.com/prometheus/client_model, github.com/prometheus/profcs to preferred versions
2 parents 18533fe + 12d66f6 commit 117160a

File tree

96 files changed

+3529
-531
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+3529
-531
lines changed

Godeps/LICENSES

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ require (
129129
github.com/pmezard/go-difflib v1.0.0
130130
github.com/prometheus/client_golang v0.9.2
131131
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910
132-
github.com/prometheus/common v0.2.0
132+
github.com/prometheus/common v0.0.0-20181126121408-4724e9255275
133133
github.com/quobyte/api v0.1.2
134134
github.com/rancher/go-rancher v0.0.0-20160922212217-09693a8743ba
135135
github.com/robfig/cron v0.0.0-20170309132418-df38d32658d8
@@ -208,19 +208,15 @@ replace (
208208
github.com/Azure/go-autorest => github.com/Azure/go-autorest v11.1.0+incompatible
209209
github.com/BurntSushi/toml => github.com/BurntSushi/toml v0.3.0
210210
github.com/BurntSushi/xgb => github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802
211-
github.com/GeertJohan/go.rice => github.com/GeertJohan/go.rice v0.0.0-20170420135705-c02ca9a983da
212211
github.com/GoogleCloudPlatform/k8s-cloud-provider => github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20181220005116-f8e995905100
213212
github.com/JeffAshton/win_pdh => github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab
214213
github.com/MakeNowJust/heredoc => github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd
215214
github.com/Microsoft/go-winio => github.com/Microsoft/go-winio v0.4.11
216215
github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.0.0-20190110205307-69ac8d3f7fc1
217216
github.com/NYTimes/gziphandler => github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46
218-
github.com/Nvveen/Gotty => github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5
219217
github.com/PuerkitoBio/purell => github.com/PuerkitoBio/purell v1.1.0
220218
github.com/PuerkitoBio/urlesc => github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578
221219
github.com/Rican7/retry => github.com/Rican7/retry v0.1.0
222-
github.com/alecthomas/template => github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc
223-
github.com/alecthomas/units => github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf
224220
github.com/armon/circbuf => github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e
225221
github.com/asaskevich/govalidator => github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf
226222
github.com/auth0/go-jwt-middleware => github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7
@@ -253,7 +249,6 @@ replace (
253249
github.com/cyphar/filepath-securejoin => github.com/cyphar/filepath-securejoin v0.0.0-20170720062807-ae69057f2299
254250
github.com/d2g/dhcp4 => github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c
255251
github.com/d2g/dhcp4client => github.com/d2g/dhcp4client v0.0.0-20170829104524-6e570ed0a266
256-
github.com/daaku/go.zipexe => github.com/daaku/go.zipexe v0.0.0-20150329023125-a5fe2436ffcb
257252
github.com/davecgh/go-spew => github.com/davecgh/go-spew v1.1.1
258253
github.com/daviddengcn/go-colortext => github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd
259254
github.com/dgrijalva/jwt-go => github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda
@@ -273,8 +268,6 @@ replace (
273268
github.com/fsnotify/fsnotify => github.com/fsnotify/fsnotify v1.4.7
274269
github.com/ghodss/yaml => github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4
275270
github.com/globalsign/mgo => github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8
276-
github.com/go-kit/kit => github.com/go-kit/kit v0.8.0
277-
github.com/go-logfmt/logfmt => github.com/go-logfmt/logfmt v0.3.0
278271
github.com/go-openapi/analysis => github.com/go-openapi/analysis v0.17.2
279272
github.com/go-openapi/errors => github.com/go-openapi/errors v0.17.2
280273
github.com/go-openapi/jsonpointer => github.com/go-openapi/jsonpointer v0.19.0
@@ -286,14 +279,12 @@ replace (
286279
github.com/go-openapi/swag => github.com/go-openapi/swag v0.17.2
287280
github.com/go-openapi/validate => github.com/go-openapi/validate v0.18.0
288281
github.com/go-ozzo/ozzo-validation => github.com/go-ozzo/ozzo-validation v3.5.0+incompatible
289-
github.com/go-sql-driver/mysql => github.com/go-sql-driver/mysql v1.3.0
290-
github.com/go-stack/stack => github.com/go-stack/stack v1.8.0
291282
github.com/godbus/dbus => github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55
292283
github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415
293284
github.com/golang/glog => github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
294285
github.com/golang/groupcache => github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903
295286
github.com/golang/mock => github.com/golang/mock v0.0.0-20160127222235-bd3c8e81be01
296-
github.com/golang/protobuf => github.com/golang/protobuf v1.1.0
287+
github.com/golang/protobuf => github.com/golang/protobuf v1.2.0
297288
github.com/golangplus/bytes => github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450
298289
github.com/golangplus/fmt => github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995
299290
github.com/golangplus/testing => github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e
@@ -309,7 +300,6 @@ replace (
309300
github.com/gorilla/context => github.com/gorilla/context v1.1.1
310301
github.com/gorilla/mux => github.com/gorilla/mux v1.7.0
311302
github.com/gorilla/websocket => github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c
312-
github.com/gotestyourself/gotestyourself => github.com/gotestyourself/gotestyourself v2.2.0+incompatible
313303
github.com/gregjones/httpcache => github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7
314304
github.com/grpc-ecosystem/go-grpc-middleware => github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79
315305
github.com/grpc-ecosystem/go-grpc-prometheus => github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20170330212424-2500245aa611
@@ -324,23 +314,17 @@ replace (
324314
github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
325315
github.com/inconshreveable/mousetrap => github.com/inconshreveable/mousetrap v1.0.0
326316
github.com/jmespath/go-jmespath => github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af
327-
github.com/jmhodges/clock => github.com/jmhodges/clock v0.0.0-20160418191101-880ee4c33548
328-
github.com/jmoiron/sqlx => github.com/jmoiron/sqlx v0.0.0-20180124204410-05cef0741ade
329317
github.com/jonboulle/clockwork => github.com/jonboulle/clockwork v0.0.0-20141017032234-72f9bd7c4e0c
330318
github.com/json-iterator/go => github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be
331319
github.com/jstemmer/go-junit-report => github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024
332320
github.com/jteeuwen/go-bindata => github.com/jteeuwen/go-bindata v0.0.0-20151023091102-a0ff2567cfb7
333321
github.com/jtolds/gls => github.com/jtolds/gls v4.20.0+incompatible
334-
github.com/julienschmidt/httprouter => github.com/julienschmidt/httprouter v1.2.0
335322
github.com/kardianos/osext => github.com/kardianos/osext v0.0.0-20150410034420-8fef92e41e22
336323
github.com/karrick/godirwalk => github.com/karrick/godirwalk v1.7.5
337-
github.com/kisielk/sqlstruct => github.com/kisielk/sqlstruct v0.0.0-20150923205031-648daed35d49
338324
github.com/konsorten/go-windows-terminal-sequences => github.com/konsorten/go-windows-terminal-sequences v1.0.1
339325
github.com/kr/fs => github.com/kr/fs v0.0.0-20131111012553-2788f0dbd169
340-
github.com/kr/logfmt => github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515
341326
github.com/kr/pretty => github.com/kr/pretty v0.0.0-20140812000539-f31442d60e51
342327
github.com/kr/text => github.com/kr/text v0.0.0-20130911015532-6807e777504f
343-
github.com/lib/pq => github.com/lib/pq v0.0.0-20180201184707-88edab080323
344328
github.com/libopenstorage/openstorage => github.com/libopenstorage/openstorage v0.0.0-20170906232338-093a0c388875
345329
github.com/liggitt/tabwriter => github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
346330
github.com/lithammer/dedent => github.com/lithammer/dedent v1.1.0
@@ -349,7 +333,6 @@ replace (
349333
github.com/mailru/easyjson => github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329
350334
github.com/marstr/guid => github.com/marstr/guid v0.0.0-20170427235115-8bdf7d1a087c
351335
github.com/mattn/go-shellwords => github.com/mattn/go-shellwords v0.0.0-20180605041737-f8471b0a71de
352-
github.com/mattn/go-sqlite3 => github.com/mattn/go-sqlite3 v1.6.0
353336
github.com/matttproud/golang_protobuf_extensions => github.com/matttproud/golang_protobuf_extensions v1.0.1
354337
github.com/mesos/mesos-go => github.com/mesos/mesos-go v0.0.9
355338
github.com/mholt/caddy => github.com/mholt/caddy v0.0.0-20180213163048-2de495001514
@@ -365,7 +348,6 @@ replace (
365348
github.com/mrunalp/fileutils => github.com/mrunalp/fileutils v0.0.0-20160930181131-4ee1cc9a8058
366349
github.com/munnerz/goautoneg => github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d
367350
github.com/mvdan/xurls => github.com/mvdan/xurls v0.0.0-20160110113200-1b768d7c393a
368-
github.com/mwitkow/go-conntrack => github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223
369351
github.com/mxk/go-flowrate => github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f
370352
github.com/natefinch/lumberjack => github.com/natefinch/lumberjack v2.0.0+incompatible
371353
github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe
@@ -385,9 +367,9 @@ replace (
385367
github.com/pquerna/cachecontrol => github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021
386368
github.com/pquerna/ffjson => github.com/pquerna/ffjson v0.0.0-20180717144149-af8b230fcd20
387369
github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.2
388-
github.com/prometheus/client_model => github.com/prometheus/client_model v0.0.0-20150212101744-fa8ad6fec335
389-
github.com/prometheus/common => github.com/prometheus/common v0.2.0
390-
github.com/prometheus/procfs => github.com/prometheus/procfs v0.0.0-20170519190837-65c1f6f8f0fc
370+
github.com/prometheus/client_model => github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910
371+
github.com/prometheus/common => github.com/prometheus/common v0.0.0-20181126121408-4724e9255275
372+
github.com/prometheus/procfs => github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a
391373
github.com/quobyte/api => github.com/quobyte/api v0.1.2
392374
github.com/rancher/go-rancher => github.com/rancher/go-rancher v0.0.0-20160922212217-09693a8743ba
393375
github.com/remyoudompheng/bigfft => github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446
@@ -444,7 +426,6 @@ replace (
444426
google.golang.org/appengine => google.golang.org/appengine v1.5.0
445427
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20170731182057-09f6ed296fc6
446428
google.golang.org/grpc => google.golang.org/grpc v1.13.0
447-
gopkg.in/alecthomas/kingpin.v2 => gopkg.in/alecthomas/kingpin.v2 v2.2.6
448429
gopkg.in/check.v1 => gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405
449430
gopkg.in/fsnotify.v1 => gopkg.in/fsnotify.v1 v1.4.7
450431
gopkg.in/gcfg.v1 => gopkg.in/gcfg.v1 v1.2.0

0 commit comments

Comments
 (0)