beorn7 1bb077b5ef Merge branch 'release-1.0' into beorn7/release		2016-07-21 14:55:05 +02:00
..
api/v1	api: drop legacy API	2016-06-23 17:14:32 +02:00
ui	Recreate assets	2016-07-21 14:11:09 +02:00
federate.go	Improve MetricsForLabelMatchers	2016-03-09 00:25:59 +01:00
web.go	web: return status code and error message for config resource	2016-07-15 10:15:24 +02:00
web_test.go	Add missing license headers	2016-04-13 16:08:22 +02:00