Matti Savolainen 3b8e7c1277 Merge branch 'master' of https://github.com/prometheus/prometheus into bug/target_label_unmarshal		2016-10-19 00:33:52 +03:00
..
testdata	Make TargetLabel in RelabelConfig a string	2016-10-19 00:33:22 +03:00
config_test.go	Merge pull request #2093 from dominikschulz/spelling	2016-10-18 22:46:03 +02:00
config.go	Merge branch 'master' of https://github.com/prometheus/prometheus into bug/target_label_unmarshal	2016-10-19 00:33:52 +03:00