10 Commits (3697075b8f08bbd838f8db56d6568c8119d61c69)

Author	SHA1	Message	Date
Brian Brazil	9aa8f822c1	Fix typo	2017-05-24 13:52:45 +01:00
Brian Brazil	5c9a6ce747	Add license to files. ... This should fix CI for dev-2.0.	2017-04-19 13:46:22 +01:00
Fabian Reinartz	8ffc851147	Merge branch 'master' into dev-2.0	2017-04-04 15:17:56 +02:00
Fabian Reinartz	e94b0899ee	rules: fix tests, remove model types	2016-12-29 17:31:14 +01:00
Fabian Reinartz	8b4e4a9d2b	notifier: fully use labels.Labels	2016-12-29 16:53:11 +01:00
Fabian Reinartz	f8fc1f5bb2	*: migrate ingestion to new batch Appender	2016-12-29 11:03:56 +01:00
Fabian Reinartz	71fe0c58a8	promql: misc fixes	2016-12-28 11:32:15 +01:00
Fabian Reinartz	5817cb5bde	*: migrate from model.* to promql.* types	2016-12-25 00:37:46 +01:00
Fabian Reinartz	9ea10d5265	promql: use labels.Builder to modify labels	2016-12-24 14:35:24 +01:00
Fabian Reinartz	c6cd998905	promql: use local labels, add conversion	2016-12-24 14:01:37 +01:00