Fabian Reinartz 25f3e1c424 Merge branch 'master' into mergemaster		2017-08-10 17:04:25 +02:00
..
kubernetes-rabbitmq	Fix typo in documentation/examples/kubernetes-rabbitmq/README.md	2016-02-08 02:00:10 +01:00
remote_storage	Update example remote adapters for change in proto location.	2017-07-19 16:39:02 +01:00
prometheus-kubernetes.yml	documentation: update Kubernetes example for 1.7 (#2918)	2017-07-21 14:10:02 +02:00
prometheus.yml	The defaults stated in the example config where wrong (#2110)	2016-11-21 09:53:59 +01:00
rbac-setup.yml	Kubernetes config scrape node via api proxy (#2641)	2017-05-09 13:57:49 +02:00