Merge branch 'master' of github.com:grafana/grafana

700a3f9f · Torkel Ödegaard · f9b13791 · 78863183 · 700a3f9f
Commit 700a3f9f authored Dec 04, 2015 by Torkel Ödegaard
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

public/app/plugins/datasource/cloudwatch/datasource.js
+1 -1

No files found.
--- a/public/app/plugins/datasource/cloudwatch/datasource.js
+++ b/public/app/plugins/datasource/cloudwatch/datasource.js
@@ -129,7 +129,7 @@ function (angular, _) {
        .pluck('Dimensions')
        .flatten()
        .filter(function(dimension) {
-          return dimension.Name === dimensionKey;
+          return dimension !== null && dimension.Name === dimensionKey;
        })
        .pluck('Value')
        .uniq()