beorn7 92c0ef1a92 Merge branch 'release-1.2' into beorn7/release		2016-11-03 22:48:39 +01:00
..
consul	Add Consul-SD metrics (#2097)	2016-10-21 08:59:43 +01:00
dns	Merge branch 'release-1.2' into beorn7/release	2016-11-03 22:48:39 +01:00
fixtures	Fix discarding of labels in file target groups	2015-05-27 18:52:44 +02:00
kubernetes	kubernetes: fix typo in endpoint switch case	2016-10-18 16:20:26 +02:00
marathon	Call SD metrics refresh rather than scrape. (#2120)	2016-10-26 10:03:35 +01:00
azure.go	Call SD metrics refresh rather than scrape. (#2120)	2016-10-26 10:03:35 +01:00
discovery.go	Resolve merge conflicts	2016-10-18 14:14:24 +01:00
ec2.go	Call SD metrics refresh rather than scrape. (#2120)	2016-10-26 10:03:35 +01:00
file.go	Add File-SD metrics (#2103)	2016-10-21 11:12:19 +01:00
file_test.go	change config names to files for consistency	2016-05-30 07:47:58 +07:00
gce.go	Call SD metrics refresh rather than scrape. (#2120)	2016-10-26 10:03:35 +01:00
nerve.go	retrieval: correctly handle IPv6 addresses	2016-09-06 15:06:49 +02:00
serverset.go	retrieval: correctly handle IPv6 addresses	2016-09-06 15:06:49 +02:00