Fabian Reinartz 921c6ebb3b Merge branch 'dev-2.0' into mergemaster		2017-08-10 17:27:52 +02:00
..
api	Guard reload and quit endpoints by flag	2017-07-11 14:25:07 +02:00
ui	Merge branch 'master' into mergemaster	2017-08-10 17:04:25 +02:00
federate.go	Consolidate the duration params in CLI	2017-06-16 20:20:57 +05:30
federate_test.go	Drop series for federation if latest sample is stale.	2017-05-24 14:27:17 +01:00
web.go	Merge branch 'dev-2.0' into mergemaster	2017-08-10 17:27:52 +02:00
web_test.go	Merge branch 'master' into mergemaster	2017-08-10 17:04:25 +02:00