Torkel Ödegaard f36a44c49a Merge branch 'master' into alerting_definitions ... Conflicts: conf/defaults.ini pkg/api/dashboard.go		2016-06-06 08:43:01 +02:00
..
api	Merge branch 'master' into alerting_definitions	2016-06-06 08:43:01 +02:00
bus	clarify which handler is not found	2015-06-26 12:32:24 -07:00
cmd	Merge branch 'master' into alerting_definitions	2016-06-06 08:43:01 +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	allow setting level on logger.	2016-02-18 16:46:47 +11:00
login	new config option for source of %s in group_search_filter, useful for nested LDAP groups	2016-03-23 08:21:25 -04:00
metrics	feat(instrumentation): check if enabled in http api metrics route	2016-06-03 21:22:34 +02:00
middleware	Merge branch 'metrics_reporting'	2016-06-03 18:06:41 +02:00
models	feat(alerting): remove orgid from alertrule query	2016-06-03 15:24:53 +02:00
plugins	fix(pluginlist): fixed issue with plugin list, fixes #5068	2016-05-17 21:51:19 +02:00
services	feat(alerting): remove orgid from alertrule query	2016-06-03 15:24:53 +02:00
setting	Merge branch 'master' into alerting_definitions	2016-06-06 08:43:01 +02:00
social	gofmt happiness	2015-11-07 11:32:06 -06:00
util	test(util): add unit test for string util	2016-06-03 15:06:54 +02:00