Torkel Ödegaard a66027830b Merge branch 'alerting_definitions' of github.com:grafana/grafana into alerting_definitions

2016-06-08 09:42:31 +02:00

..

api

Merge branch 'master' into alerting_definitions

2016-06-08 09:36:50 +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(logging): added log format option, #4590

2016-06-08 08:48:46 +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

feat(logging): added uname to context logger

2016-06-07 12:20:46 +02:00

models

feat(alerting): requests looks to be working again

2016-06-06 17:11:46 +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 'alerting_definitions' of github.com:grafana/grafana into alerting_definitions

2016-06-08 09:42:31 +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

feat(alerting): fixed test issues

2016-06-07 14:54:30 +02:00

util

test(util): add unit test for string util

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