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/679d8499 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/679d8499 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/679d8499 Branch: refs/heads/master Commit: 679d84999dd7c6293a05bef71ea7cacfa90247b4 Parents: 9386be8 b5ad17d Author: Josh Elser <els...@apache.org> Authored: Tue Feb 11 23:01:29 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Tue Feb 11 23:01:29 2014 -0500 ---------------------------------------------------------------------- CHANGES | 296 ++++++++++++++----- .../providers/ReadOnlyHdfsFileProviderTest.java | 2 +- .../vfs/providers/VfsClassLoaderTest.java | 2 +- .../apache/accumulo/test/AccumuloDFSBase.java | 30 +- 4 files changed, 245 insertions(+), 85 deletions(-) ----------------------------------------------------------------------