Goutham Veeramachaneni 37e7b69f56 Merge remote-tracking branch 'upstream/dev-2.0' into rulegroups ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>		2017-06-19 16:34:55 +05:30
..
api/v1	Merge branch 'master' into dev-2.0	2017-05-12 13:29:58 +02:00
ui	Reflect the grouping in the UI	2017-06-14 16:09:14 +05:30
federate_test.go	Drop series for federation if latest sample is stale.	2017-05-24 14:27:17 +01:00
federate.go	Consolidate the duration params in CLI	2017-06-16 20:20:57 +05:30
web_test.go	Add missing license headers	2016-04-13 16:08:22 +02:00
web.go	Flag changes for 2.0	2017-06-16 20:21:41 +05:30