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

docs/sources/http_api/alerting.md

@@ -87,7 +87,7 @@ This API can also be used to create, update and delete alert notifications.
 
 
     {
     {
       "alertId": 1,
       "alertId": 1,
-      "paused: true
+      "paused": true
     }
     }
 
 
 **Example Response**:
 **Example Response**:

pkg/services/alerting/notifiers/opsgenie.go

@@ -30,7 +30,7 @@ func init() {
            label="Auto close incidents"
            label="Auto close incidents"
            label-class="width-14"
            label-class="width-14"
            checked="ctrl.model.settings.autoClose"
            checked="ctrl.model.settings.autoClose"
-           tooltip="Automatically close alerts in OpseGenie once the alert goes back to ok.">
+           tooltip="Automatically close alerts in OpsGenie once the alert goes back to ok.">
         </gf-form-switch>
         </gf-form-switch>
       </div>
       </div>
     `,
     `,

public/app/features/panel/panel_directive.ts

@@ -160,6 +160,7 @@ module.directive('grafanaPanel', function($rootScope, $document) {
             classes: ctrl.error ? 'drop-error' : 'drop-help',
             classes: ctrl.error ? 'drop-error' : 'drop-help',
             openOn: 'hover',
             openOn: 'hover',
             hoverOpenDelay: 100,
             hoverOpenDelay: 100,
+            constrainToScrollParent: false,
           });
           });
         }
         }
       }
       }