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

src/app/services/graphite/gfunc.js

@@ -51,6 +51,13 @@ function (_) {
   });
 
   addFuncDef({
+    name: "nPercentile",
+    category: categories.Calculate,
+    params: [ { name: "Nth percentile", type: 'int' } ],
+    defaultParams: [95]
+  });
+
+  addFuncDef({
     name: 'sumSeries',
     shortName: 'sum',
     category: categories.Combine,
@@ -164,6 +171,11 @@ function (_) {
   });
 
   addFuncDef({
+    name: 'keepLastValue',
+    category: categories.Special,
+  });
+
+  addFuncDef({
     name: 'scale',
     category: categories.Transform,
     params: [ { name: "factor", type: "int", } ],