Merge branch 'master' of https://github.com/f1yegor/grafana into f1yegor-master

2016-06-25 20:38:43 +02:00
parent 12570bb959 d002cab28f
commit 4cbde7e747
1 changed files with 3 additions and 0 deletions
@@ -664,6 +664,9 @@ function($, _, moment) {
          {text: 'reads/sec (rps)',     value: 'rps' },
          {text: 'writes/sec (wps)',    value: 'wps' },
          {text: 'I/O ops/sec (iops)',  value: 'iops'},
          {text: 'ops/min (opm)',       value: 'opm' },
          {text: 'reads/min (rpm)',     value: 'rpm' },
          {text: 'writes/min (wpm)',    value: 'wpm' },
        ]
      },
      {