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/9338b522 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9338b522 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9338b522 Branch: refs/heads/master Commit: 9338b522f58d48d1d656a182e4324dccd2545173 Parents: e1ed7a4 592d7d6 Author: Bill Havanki <bhava...@cloudera.com> Authored: Wed Jan 15 16:09:43 2014 -0500 Committer: Bill Havanki <bhava...@cloudera.com> Committed: Wed Jan 15 16:09:43 2014 -0500 ---------------------------------------------------------------------- .../apache/accumulo/server/fs/ViewFSUtils.java | 59 ++++++++++- .../accumulo/server/fs/VolumeManagerImpl.java | 8 ++ .../accumulo/server/util/MetadataTableUtil.java | 10 +- .../accumulo/server/fs/ViewFSUtilsTest.java | 100 +++++++++++++++++++ .../accumulo/master/tableOps/BulkImport.java | 2 +- 5 files changed, 168 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
