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/12/20 17:10:39 UTC
[05/12] git commit: Merge branch '1.6.0-SNAPSHOT' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 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/b59c2687
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b59c2687
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b59c2687
Branch: refs/heads/master
Commit: b59c2687a983f82d7efd2b80cc012a5e8e2f1c74
Parents: ed73039 0b95612
Author: Josh Elser <el...@apache.org>
Authored: Thu Dec 19 23:22:34 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Thu Dec 19 23:22:34 2013 -0500
----------------------------------------------------------------------
.../core/client/admin/TableOperationsImpl.java | 4 +-
.../core/client/impl/OfflineScanner.java | 8 +--
.../org/apache/accumulo/core/file/FileUtil.java | 7 +++
.../apache/accumulo/core/zookeeper/ZooUtil.java | 4 +-
.../apache/accumulo/server/fs/ViewFSUtils.java | 51 ++++++++++++++++++
.../accumulo/server/fs/VolumeManagerImpl.java | 18 ++++++-
.../server/master/recovery/HadoopLogCloser.java | 14 ++++-
.../server/master/recovery/RecoveryPath.java | 56 ++++++++++++++++++++
.../master/recovery/RecoveryManager.java | 14 +++--
.../apache/accumulo/tserver/TabletServer.java | 5 +-
10 files changed, 158 insertions(+), 23 deletions(-)
----------------------------------------------------------------------