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

This commit is contained in:
Torkel Ödegaard 2016-07-25 12:04:58 +02:00
commit ee0d6ecfe6

View File

@ -212,7 +212,7 @@ export class InfluxQueryCtrl extends QueryCtrl {
if (/^\/.*\/$/.test(nextValue)) { if (/^\/.*\/$/.test(nextValue)) {
return this.$q.when(this.uiSegmentSrv.newOperators(['=~', '!~'])); return this.$q.when(this.uiSegmentSrv.newOperators(['=~', '!~']));
} else { } else {
return this.$q.when(this.uiSegmentSrv.newOperators(['=', '<>', '<', '>'])); return this.$q.when(this.uiSegmentSrv.newOperators(['=', '!=', '<>', '<', '>']));
} }
} }