accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [3/3] git commit: Merge branch '1.6.0-SNAPSHOT'
Date Tue, 25 Feb 2014 17:26:33 GMT
Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/83b099c2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/83b099c2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/83b099c2

Branch: refs/heads/master
Commit: 83b099c284275f5461a1beb370092f38c56b3883
Parents: 08f0b9a 840dba2
Author: Eric Newton <eric.newton@gmail.com>
Authored: Tue Feb 25 12:26:35 2014 -0500
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Tue Feb 25 12:26:35 2014 -0500

----------------------------------------------------------------------
 .../apache/accumulo/core/cli/ClientOpts.java    |   2 +-
 .../core/conf/DefaultConfiguration.java         |   2 +-
 .../file/blockfile/impl/CachableBlockFile.java  |  45 ++--
 .../accumulo/core/file/rfile/PrintInfo.java     |   5 +-
 .../core/file/rfile/RFileOperations.java        |   6 +-
 .../accumulo/core/file/rfile/SplitLarge.java    |  10 +-
 .../accumulo/core/file/rfile/bcfile/BCFile.java |  15 +-
 .../core/file/rfile/bcfile/PrintInfo.java       |   9 +-
 .../accumulo/core/security/SecurityUtil.java    |   4 +-
 .../apache/accumulo/core/util/shell/Shell.java  |   2 +-
 .../apache/accumulo/core/zookeeper/ZooUtil.java |   5 +-
 .../mapred/AccumuloFileOutputFormatTest.java    |   3 +
 .../apache/accumulo/core/conf/PropertyTest.java |   2 +-
 .../core/file/rfile/CreateCompatTestFile.java   |   3 +-
 .../core/file/rfile/MultiLevelIndexTest.java    |   6 +-
 .../accumulo/core/file/rfile/RFileTest.java     | 243 +++++++------------
 .../iterators/user/IndexedDocIteratorTest.java  |   3 +-
 .../core/security/crypto/CryptoTest.java        | 100 +++-----
 .../core/util/shell/ShellSetInstanceTest.java   |   2 +-
 core/src/test/resources/log4j.properties        |   2 +-
 .../apache/accumulo/server/ServerConstants.java |   2 +-
 .../accumulo/server/client/HdfsZooInstance.java |   2 +-
 .../accumulo/server/conf/ZooConfiguration.java  |   2 +-
 .../apache/accumulo/server/init/Initialize.java |   7 +-
 .../accumulo/gc/SimpleGarbageCollector.java     |   2 +-
 .../java/org/apache/accumulo/master/Master.java |   2 +-
 .../accumulo/master/state/SetGoalState.java     |   3 +-
 .../org/apache/accumulo/monitor/Monitor.java    |   2 +-
 .../org/apache/accumulo/tracer/TraceServer.java |   2 +-
 .../apache/accumulo/tserver/TabletServer.java   |   4 +-
 .../accumulo/tserver/logger/LogReader.java      |   5 +-
 .../tserver/log/TestUpgradePathForWALogs.java   |   8 +-
 .../test/randomwalk/concurrent/BulkImport.java  |   4 +-
 33 files changed, 200 insertions(+), 314 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/83b099c2/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/83b099c2/server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/83b099c2/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/83b099c2/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/83b099c2/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BulkImport.java
----------------------------------------------------------------------


Mime
View raw message