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

pkg/tsdb/cloudwatch/metric_find_query.go

@@ -127,7 +127,7 @@ func init() {
 		"AWS/Events":           {"RuleName"},
 		"AWS/Events":           {"RuleName"},
 		"AWS/Firehose":         {"DeliveryStreamName"},
 		"AWS/Firehose":         {"DeliveryStreamName"},
 		"AWS/IoT":              {"Protocol"},
 		"AWS/IoT":              {"Protocol"},
-		"AWS/Kinesis":          {"StreamName", "ShardID"},
+		"AWS/Kinesis":          {"StreamName", "ShardId"},
 		"AWS/KinesisAnalytics": {"Flow", "Id", "Application"},
 		"AWS/KinesisAnalytics": {"Flow", "Id", "Application"},
 		"AWS/Lambda":           {"FunctionName", "Resource", "Version", "Alias"},
 		"AWS/Lambda":           {"FunctionName", "Resource", "Version", "Alias"},
 		"AWS/Logs":             {"LogGroupName", "DestinationType", "FilterName"},
 		"AWS/Logs":             {"LogGroupName", "DestinationType", "FilterName"},

public/app/features/dashboard/create_folder_ctrl.ts

@@ -6,6 +6,7 @@ export class CreateFolderCtrl {
   nameExists = false;
   nameExists = false;
   titleTouched = false;
   titleTouched = false;
 
 
+  /** @ngInject **/
   constructor(private backendSrv, private $location, navModelSrv) {
   constructor(private backendSrv, private $location, navModelSrv) {
     this.navModel = navModelSrv.getNav('dashboards', 'manage-dashboards', 0);
     this.navModel = navModelSrv.getNav('dashboards', 'manage-dashboards', 0);
   }
   }

public/app/features/org/team_details_ctrl.ts

@@ -5,6 +5,7 @@ export default class TeamDetailsCtrl {
   teamMembers: User[] = [];
   teamMembers: User[] = [];
   navModel: any;
   navModel: any;
 
 
+  /** @ngInject **/
   constructor(private $scope, private backendSrv, private $routeParams, navModelSrv) {
   constructor(private $scope, private backendSrv, private $routeParams, navModelSrv) {
     this.navModel = navModelSrv.getNav('cfg', 'teams', 0);
     this.navModel = navModelSrv.getNav('cfg', 'teams', 0);
     this.get();
     this.get();