Commit 64aedbf4 by bergquist

Merge branch 'mayli-master'

* mayli-master:
  Use B/s instead Bps for Bytes per second
parents c80d3464 0ee6a521
...@@ -455,7 +455,7 @@ kbn.valueFormats.decgbytes = kbn.formatBuilders.decimalSIPrefix('B', 3); ...@@ -455,7 +455,7 @@ kbn.valueFormats.decgbytes = kbn.formatBuilders.decimalSIPrefix('B', 3);
// Data Rate // Data Rate
kbn.valueFormats.pps = kbn.formatBuilders.decimalSIPrefix('pps'); kbn.valueFormats.pps = kbn.formatBuilders.decimalSIPrefix('pps');
kbn.valueFormats.bps = kbn.formatBuilders.decimalSIPrefix('bps'); kbn.valueFormats.bps = kbn.formatBuilders.decimalSIPrefix('bps');
kbn.valueFormats.Bps = kbn.formatBuilders.decimalSIPrefix('Bps'); kbn.valueFormats.Bps = kbn.formatBuilders.decimalSIPrefix('B/s');
kbn.valueFormats.KBs = kbn.formatBuilders.decimalSIPrefix('Bs', 1); kbn.valueFormats.KBs = kbn.formatBuilders.decimalSIPrefix('Bs', 1);
kbn.valueFormats.Kbits = kbn.formatBuilders.decimalSIPrefix('bps', 1); kbn.valueFormats.Kbits = kbn.formatBuilders.decimalSIPrefix('bps', 1);
kbn.valueFormats.MBs = kbn.formatBuilders.decimalSIPrefix('Bs', 2); kbn.valueFormats.MBs = kbn.formatBuilders.decimalSIPrefix('Bs', 2);
...@@ -901,13 +901,13 @@ kbn.getUnitFormats = function() { ...@@ -901,13 +901,13 @@ kbn.getUnitFormats = function() {
{ {
text: 'hash rate', text: 'hash rate',
submenu: [ submenu: [
{text: 'hashes/sec', value: 'Hs'}, { text: 'hashes/sec', value: 'Hs' },
{text: 'kilohashes/sec', value: 'KHs'}, { text: 'kilohashes/sec', value: 'KHs' },
{text: 'megahashes/sec', value: 'MHs'}, { text: 'megahashes/sec', value: 'MHs' },
{text: 'gigahashes/sec', value: 'GHs'}, { text: 'gigahashes/sec', value: 'GHs' },
{text: 'terahashes/sec', value: 'THs'}, { text: 'terahashes/sec', value: 'THs' },
{text: 'petahashes/sec', value: 'PHs'}, { text: 'petahashes/sec', value: 'PHs' },
{text: 'exahashes/sec', value: 'EHs'}, { text: 'exahashes/sec', value: 'EHs' },
], ],
}, },
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment