Torkel Ödegaard 69d0e82453 Merge branch 'master' into apps ... Conflicts: pkg/services/sqlstore/migrations/migrations.go		2016-01-08 10:20:46 +01:00
..
cloudwatch	tech(systemjs): merged sync with master, all tests are passing	2015-12-21 16:13:24 +01:00
elasticsearch	tech(systemjs): merged sync with master, all tests are passing	2015-12-21 16:13:24 +01:00
grafana	Fixed #2798. Removed unused components.	2015-09-22 12:16:10 +05:30
graphite	feat(apps): minor progress on app meta data	2015-12-22 16:32:17 +01:00
influxdb	refactor(lodash): changed how lodash is referenced from typescript	2015-12-22 13:59:11 +01:00
mixed	feat() started work on more feature rich time picker	2015-09-15 13:23:36 +02:00
opentsdb	Made tags editable in opentsdb query	2015-11-13 04:01:55 -08:00
prometheus	fix end time of Prometheus link	2015-12-31 16:05:04 +09:00
sql	refactoring: more moving stuff around	2015-10-30 14:44:40 +01:00