Fabian Reinartz 8ffc851147 Merge branch 'master' into dev-2.0		2017-04-04 15:17:56 +02:00
..
tsdb	vendor: sync organisation migration of tsdb	2017-04-04 11:33:51 +02:00
buffer.go	promql: Use buffer pool for matrix allocations	2017-03-14 10:57:34 +01:00
buffer_test.go	promql: Use buffer pool for matrix allocations	2017-03-14 10:57:34 +01:00
interface.go	web: deduplicate series in federation	2017-04-04 11:20:23 +02:00