You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/10/11 22:15:37 UTC
[1/2] git commit: ACCUMULO-1536 fixed load average presentation
Updated Branches:
refs/heads/master cb45e89b0 -> 142f07c4c
ACCUMULO-1536 fixed load average presentation
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d10ec173
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d10ec173
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d10ec173
Branch: refs/heads/master
Commit: d10ec173d874f73588fa44a7cc811a66a42add70
Parents: 3976e0a
Author: Eric Newton <er...@gmail.com>
Authored: Fri Oct 11 16:15:40 2013 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Fri Oct 11 16:15:40 2013 -0400
----------------------------------------------------------------------
core/src/main/java/org/apache/accumulo/core/util/NumUtil.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d10ec173/core/src/main/java/org/apache/accumulo/core/util/NumUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/NumUtil.java b/core/src/main/java/org/apache/accumulo/core/util/NumUtil.java
index 179c586..ebc8c4f 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/NumUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/NumUtil.java
@@ -46,7 +46,7 @@ public class NumUtil {
}
private static String bigNumber(double big, String[] SUFFIXES, long base) {
- if (big < base) return df.format(big) + SUFFIXES[0];
+ if (big < base) return df_mantissa.format(big) + SUFFIXES[0];
int exp = (int) (Math.log(big) / Math.log(base));
double val = big / Math.pow(base, exp);
return df_mantissa.format(val) + SUFFIXES[exp];
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/accumulo
Posted by ec...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/142f07c4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/142f07c4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/142f07c4
Branch: refs/heads/master
Commit: 142f07c4c3dcd0aee9edf329b56b4533f4a6a172
Parents: d10ec17 cb45e89
Author: Eric Newton <er...@gmail.com>
Authored: Fri Oct 11 16:15:55 2013 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Fri Oct 11 16:15:55 2013 -0400
----------------------------------------------------------------------
.../maven/plugin/AbstractAccumuloMojo.java | 31 ++++-----
.../apache/accumulo/maven/plugin/StartMojo.java | 20 +++---
.../minicluster/MiniAccumuloCluster.java | 70 ++++++++++----------
.../minicluster/MiniAccumuloConfig.java | 23 +++++++
.../apache/accumulo/server/ServerConstants.java | 62 ++++++++++++-----
.../accumulo/server/fs/VolumeManager.java | 22 +++++-
.../accumulo/server/fs/VolumeManagerImpl.java | 65 ++++++++----------
.../server/gc/GarbageCollectWriteAheadLogs.java | 5 +-
.../server/gc/SimpleGarbageCollector.java | 9 +--
.../server/master/TabletGroupWatcher.java | 7 +-
.../server/master/tableOps/CreateTable.java | 3 +-
.../server/tabletserver/FileManager.java | 5 +-
.../accumulo/server/tabletserver/Tablet.java | 9 +--
.../server/tabletserver/TabletServer.java | 5 +-
.../apache/accumulo/server/util/Initialize.java | 12 ++--
.../accumulo/server/util/MetadataTableUtil.java | 3 +-
.../org/apache/accumulo/test/VolumeTest.java | 1 +
17 files changed, 212 insertions(+), 140 deletions(-)
----------------------------------------------------------------------