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

2015-08-31 15:45:49 +02:00
parent 3dfa28570f 3405e44a1d
commit ffbf70af25
93 changed files with 25533 additions and 5 deletions
@@ -21,6 +21,7 @@
    "angular-native-dragdrop": "~1.1.1",
    "angular-bindonce": "~0.3.3",
    "requirejs": "~2.1.18",
-    "requirejs-text": "~2.0.14"
+    "requirejs-text": "~2.0.14",
+    "aws-sdk": "~2.1.42"
  }
 }