prometheus/storage
beorn7 d0a4477446 Merge branch 'beorn7/storage3' into beorn7/storage4
Conflicts:
	storage/local/preload.go
	storage/local/storage.go
	storage/local/storage_test.go
2016-03-09 17:13:16 +01:00
..
local Merge branch 'beorn7/storage3' into beorn7/storage4 2016-03-09 17:13:16 +01:00
metric Anchor regexes in vector matching 2015-11-05 11:23:43 +01:00
remote Return error on sample appending 2016-02-02 14:01:44 +01:00
storage.go Fix deadlock, structure target logging 2016-02-03 10:39:34 +01:00