Merge remote-tracking branch 'upstream/master'

22c4e605 · carl bergquist · 67737b15 · 766b9d52 · 22c4e605
Commit 22c4e605 authored Dec 11, 2015 by carl bergquist
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

public/app/plugins/datasource/influxdb/query_part.ts
+2 -2

No files found.
--- a/public/app/plugins/datasource/influxdb/query_part.ts
+++ b/public/app/plugins/datasource/influxdb/query_part.ts
@@ -227,7 +227,7 @@ QueryPartDef.register({
  type: 'derivative',
  addStrategy: addTransformationStrategy,
  category: categories.Transformations,
-  params: [{ name: "duration", type: "interval", options: ['1s', '10s', '1m', '5min', '10m', '15m', '1h']}],
+  params: [{ name: "duration", type: "interval", options: ['1s', '10s', '1m', '5m', '10m', '15m', '1h']}],
  defaultParams: ['10s'],
  renderer: functionRenderer,
 });
@@ -236,7 +236,7 @@ QueryPartDef.register({
  type: 'non_negative_derivative',
  addStrategy: addTransformationStrategy,
  category: categories.Transformations,
-  params: [{ name: "duration", type: "interval", options: ['1s', '10s', '1m', '5min', '10m', '15m', '1h']}],
+  params: [{ name: "duration", type: "interval", options: ['1s', '10s', '1m', '5m', '10m', '15m', '1h']}],
  defaultParams: ['10s'],
  renderer: functionRenderer,
 });