Torkel Ödegaard 9216492d55 Merge branch 'alert_handles' into alert_ui_take2 ...

Conflicts:
	pkg/services/alerting/commands.go

2016-06-13 07:53:13 +02:00

..

api

Merge branch 'master' into alert_ui_take2

2016-06-11 12:17:14 +02:00

bus

clarify which handler is not found

2015-06-26 12:32:24 -07:00

cmd

Merge branch 'new-logger' into alerting_definitions

2016-06-07 13:31:56 +02:00

components

[RenderToPng fix] (#4901)

2016-05-04 09:07:45 +02:00

events

feat(signup): progress on new sign up and email verification flow, #2353

2015-08-28 15:14:24 +02:00

log

feat(alerting): trying to get things to work with new model

2016-06-11 13:49:11 +02:00

login

Merge branch 'master' of github.com:grafana/grafana

2016-06-08 08:10:22 +02:00

metrics

feat(logging): progress on new logging #4590

2016-06-07 09:29:47 +02:00

middleware

Merge branch 'master' into alert_ui_take2

2016-06-11 12:17:14 +02:00

models

feat(alerting): renamed AlertRuleModel to just Alert, think making a distinction between an Alert and an Alert Rule is just confusing and was a mistake on my part

2016-06-11 10:26:48 +02:00

plugins

feat(logging): a lot of progress on moving to new logging lib, #4590

2016-06-06 23:06:44 +02:00

services

Merge branch 'alert_handles' into alert_ui_take2

2016-06-13 07:53:13 +02:00

setting

Merge branch 'new-logger' into alerting_definitions

2016-06-07 13:31:56 +02:00

social

gofmt happiness

2015-11-07 11:32:06 -06:00

tsdb

tech(alerting): add graphite dateformat replacer

2016-06-10 13:26:19 +02:00

util

test(util): add unit test for string util

2016-06-03 15:06:54 +02:00