IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cloudwatch' of https://github.com/mtanda/grafana into cloudwatch

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-08-31 15:45:49 +02:00
parent 3dfa28570f 3405e44a1d
commit ffbf70af25
93 changed files with 25533 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/test/test-main.js
View File

@@ -48,6 +48,7 @@ require.config({
'jquery.flot.fillbelow': '../vendor/flot/jquery.flot.fillbelow',
modernizr: '../vendor/modernizr-2.6.1',
'aws-sdk': '../vendor/aws-sdk/dist/aws-sdk.min',
},
shim: {
@@ -150,6 +151,7 @@ require([
'specs/unsavedChangesSrv-specs',
'specs/valueSelectDropdown-specs',
'specs/opentsdbDatasource-specs',
'specs/cloudwatch-datasource-specs',
];
var pluginSpecs = (config.plugins.specs || []).map(function (spec) {