Merge remote-tracking branch 'upstream/master'

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,
 });