Simon Pasquier 22a1def98d Merge pull request #5099 from prometheus/release-2.6 ... Merge release-2.6 to master		2019-01-16 09:26:00 +01:00
..
marathon_test.go	marathon-sd - use Tasks.Ports instead of PortDefinitions.Ports if RequirePorts is false (#5022) (#5026)	2019-01-14 17:20:22 +00:00
marathon.go	Merge pull request #5099 from prometheus/release-2.6	2019-01-16 09:26:00 +01:00