Merge remote-tracking branch 'origin/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/322ee056 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/322ee056 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/322ee056 Branch: refs/heads/master Commit: 322ee056cc61146da461d27d92f7867f8d9e19f8 Parents: 260b6bf 0b95612 Author: Keith Turner <ktur...@apache.org> Authored: Thu Dec 19 23:13:01 2013 -0500 Committer: Keith Turner <ktur...@apache.org> Committed: Thu Dec 19 23:13:01 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/322ee056/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java ----------------------------------------------------------------------
