beorn7 1f2785ebb7 Merge branch 'release-1.1'		2016-09-16 16:33:28 +02:00
..
api/v1	Bugfix: Avoid divide-by-zero panic on query_range?step=0	2016-08-16 15:20:34 +02:00
ui	Revert "Revert the /graph changes."	2016-09-03 21:05:23 +02:00
federate.go	federation: Collapse time series of the same name	2016-09-14 19:35:20 +02:00
federate_test.go	web: add more federation test scenarios	2016-09-15 15:23:55 +02:00
web.go	federation: Collapse time series of the same name	2016-09-14 19:35:20 +02:00
web_test.go	Add missing license headers	2016-04-13 16:08:22 +02:00