accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject [2/2] git commit: Merge branch '1.6.0-SNAPSHOT'
Date Thu, 27 Feb 2014 00:54:02 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/615f81e0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/615f81e0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/615f81e0

Branch: refs/heads/master
Commit: 615f81e0cb0213a97faed5c5319d683782cb5209
Parents: 160aaf8 a8058a6
Author: Keith Turner <kturner@apache.org>
Authored: Wed Feb 26 19:57:57 2014 -0500
Committer: Keith Turner <kturner@apache.org>
Committed: Wed Feb 26 19:57:57 2014 -0500

----------------------------------------------------------------------
 .../core/client/admin/TableOperationsImpl.java  |   4 +-
 .../core/client/impl/OfflineScanner.java        |   4 +-
 .../org/apache/accumulo/core/file/FileUtil.java | 130 -------------------
 .../accumulo/core/file/VolumeConfiguration.java |  96 ++++++++++++++
 .../accumulo/core/file/rfile/PrintInfo.java     |   4 +-
 .../core/file/rfile/bcfile/PrintInfo.java       |   4 +-
 .../apache/accumulo/core/util/shell/Shell.java  |   3 +-
 .../apache/accumulo/core/zookeeper/ZooUtil.java |   4 +-
 .../core/util/shell/ShellSetInstanceTest.java   |   3 +
 .../apache/accumulo/server/ServerConstants.java |  80 ++----------
 .../accumulo/server/client/BulkImporter.java    |   5 +-
 .../accumulo/server/fs/VolumeManagerImpl.java   |   6 +-
 .../apache/accumulo/server/init/Initialize.java |  19 +--
 .../monitor/servlets/DefaultServlet.java        |   4 +-
 .../tserver/BulkFailedCopyProcessor.java        |   4 +-
 .../accumulo/test/functional/BulkFileIT.java    |   4 +-
 16 files changed, 141 insertions(+), 233 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/615f81e0/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/615f81e0/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
----------------------------------------------------------------------


Mime
View raw message