Fabian Reinartz ddbbd2b712 Merge branch 'release-1.5' into cut162		2017-05-11 14:29:49 +02:00
..
azure	Follow golang naming conventions in discovery packages	2017-03-16 23:40:46 -03:00
consul	Merge pull request #2479 from YKlausz/consul-tls	2017-03-20 11:40:18 +01:00
dns	Follow golang naming conventions in discovery packages	2017-03-16 23:40:46 -03:00
ec2	Follow golang naming conventions in discovery packages	2017-03-16 23:40:46 -03:00
file	Follow golang naming conventions in discovery packages	2017-03-16 23:40:46 -03:00
gce	Follow golang naming conventions in discovery packages	2017-03-16 23:40:46 -03:00
kubernetes	Merge branch 'release-1.5' into cut162	2017-05-11 14:29:49 +02:00
marathon	Add support for multiple ports in Marathon (#2506)	2017-03-18 22:10:44 +02:00
triton	Add triton zone brand metadata	2017-04-06 21:35:42 +00:00
zookeeper	Follow golang naming conventions in discovery packages	2017-03-16 23:40:46 -03:00
discovery.go	Fix Map Race by Moving Locking closer to the Write (#2476)	2017-04-07 08:55:01 +02:00
discovery_test.go	config: extract SD and HTTPClient configurations	2016-11-23 18:23:37 +01:00