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

This commit is contained in:
Torkel Ödegaard 2016-03-16 10:32:24 +01:00
commit 0d7eb18d7b

View File

@ -222,7 +222,7 @@ function (angular, _, moment, dateMath, CloudWatchAnnotationQuery) {
.map(function(reservations) {
return _.pluck(reservations.Instances, targetAttributeName);
})
.flatten().value();
.flatten().uniq().sortBy().value();
return transformSuggestData(attributes);
});
}