Fabian Reinartz 6e804b3497 Merge branch 'master' into dev-2.0		2017-05-12 13:29:58 +02:00
..
client_golang	vendoring: Update client_golang/prometheus	2017-04-11 12:58:24 +02:00
client_model	Add missing license files of vendored packages	2016-01-21 14:44:58 -05:00
common	Instrument Prometheus with OpenTracing (#2554)	2017-05-02 18:49:29 -05:00
procfs	vendor: update prometheus org dependencies	2016-07-04 11:09:06 +02:00
tsdb	vendor: update tsdb	2017-05-09 12:53:33 +02:00