Goutham Veeramachaneni 3f0267c548 Merge branch 'dev-2.0' into go-kit/log ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>		2017-09-15 23:15:27 +05:30
..
kubernetes-rabbitmq	Fix typo in documentation/examples/kubernetes-rabbitmq/README.md	2016-02-08 02:00:10 +01:00
remote_storage	Merge branch 'dev-2.0' into go-kit/log	2017-09-15 23:15:27 +05:30
prometheus-kubernetes.yml	k8s: Support discovery of ingresses (#3111)	2017-09-04 13:10:44 +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