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

torkelo · torkelo · commit ee0d6ecfe652 · 2016-07-25T12:04:58.000+02:00
diff --git a/public/app/plugins/datasource/influxdb/query_ctrl.ts b/public/app/plugins/datasource/influxdb/query_ctrl.ts
@@ -212,7 +212,7 @@ export class InfluxQueryCtrl extends QueryCtrl {
       if (/^\/.*\/$/.test(nextValue)) {
         return this.$q.when(this.uiSegmentSrv.newOperators(['=~', '!~']));
       } else {
-        return this.$q.when(this.uiSegmentSrv.newOperators(['=', '<>', '<', '>']));
+        return this.$q.when(this.uiSegmentSrv.newOperators(['=', '!=', '<>', '<', '>']));
       }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ export class InfluxQueryCtrl extends QueryCtrl {`
`212`	`212`	`if (/^\/.*\/$/.test(nextValue)) {`
`213`	`213`	`return this.$q.when(this.uiSegmentSrv.newOperators(['=~', '!~']));`
`214`	`214`	`} else {`
`215`		`- return this.$q.when(this.uiSegmentSrv.newOperators(['=', '<>', '<', '>']));`
	`215`	`+ return this.$q.when(this.uiSegmentSrv.newOperators(['=', '!=', '<>', '<', '>']));`
`216`	`216`	`}`
`217`	`217`	`}`
`218`	`218`