Fabian Reinartz dba7586671 Merge branch 'master' into dev-2.0		2017-07-11 17:22:14 +02:00
..
azure	Use log.Logger interface for all discovery services	2017-06-01 11:25:55 -05:00
consul	Hide consul token on UI. (#2797)	2017-06-01 22:14:23 +01:00
dns	Use log.Logger interface for all discovery services	2017-06-01 11:25:55 -05:00
ec2	Use log.Logger interface for all discovery services	2017-06-01 11:25:55 -05:00
file	Fixing tests for Windows	2017-07-09 01:59:30 -03:00
gce	Use log.Logger interface for all discovery services	2017-06-01 11:25:55 -05:00
kubernetes	Replace regex with Secret type and remarshal config to hide secrets (#2775)	2017-05-29 12:46:23 +01:00
marathon	Marathon SD: Set port index label	2017-06-23 09:52:52 +01:00
openstack	Openstack Service Discovery (#2701)	2017-06-01 23:49:02 +02:00
triton	Add triton zone brand metadata	2017-04-06 21:35:42 +00:00
zookeeper	Rework logging to use explicitly passed logger	2017-06-16 15:52:44 +05:30
discovery.go	Openstack Service Discovery (#2701)	2017-06-01 23:49:02 +02:00
discovery_test.go	Use log.Logger interface for all discovery services	2017-06-01 11:25:55 -05:00