Fernandez Ludovic 586ba31120 Merge v1.6.4 into master		2018-06-15 17:58:20 +02:00
..
api.go	Merge branch 'v1.5' into master	2018-01-24 15:11:21 +01:00
config_root.go	Segments Labels: Rancher & Marathon	2018-03-26 15:32:04 +02:00
config_test.go	Override health check scheme	2018-05-14 12:08:03 +02:00
config.go	Use net.JoinHostPort for servers URL	2018-06-13 10:08:03 +02:00
deprecated_config_test.go	Server weight zero	2018-04-11 16:30:04 +02:00
deprecated_config.go	Server weight zero	2018-04-11 16:30:04 +02:00
metadata.go	Migrate Sirupsen to sirupsen.	2018-01-22 12:16:03 +01:00
rancher.go	Segments Labels: Rancher & Marathon	2018-03-26 15:32:04 +02:00