Fabian Reinartz 669075c6b9 Merge branch 'master' into dev-2.0		2017-06-06 09:36:51 +02:00
..
github.com	Merge branch 'master' into dev-2.0	2017-06-06 09:36:51 +02:00
golang.org/x	vendor: remove unused dependency and last ref to fabxc/tsdb	2017-04-27 10:23:34 +02:00
google.golang.org	vendor: drop unused dependencies	2016-12-22 23:20:34 +01:00
gopkg.in	kubernetes: use and vendor 1.5 client	2016-10-17 10:32:10 +02:00
k8s.io	Merge branch 'master' into dev-2.0	2017-05-12 13:29:58 +02:00
vendor.json	Merge branch 'master' into dev-2.0	2017-06-06 09:36:51 +02:00