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

83662b51 · bergquist · 8750ba94 · 30f3b55b · 83662b51
Commit 83662b51 authored Feb 25, 2016 by bergquist
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

public/app/plugins/datasource/prometheus/plugin.json
+2 -1

No files found.
--- a/public/app/plugins/datasource/prometheus/plugin.json
+++ b/public/app/plugins/datasource/prometheus/plugin.json
@@ -4,5 +4,6 @@
  "id": "prometheus",
  "metrics": true,
-  "annotations": true
+  "annotations": true,
+  "defaultMatchFormat": "pipe"
 }