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/1e2853dc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1e2853dc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1e2853dc Branch: refs/heads/master Commit: 1e2853dc5b41e7939c4868538df20f2fcfacef25 Parents: 1342897 1a91326 Author: Josh Elser <els...@apache.org> Authored: Thu Feb 13 19:13:49 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Thu Feb 13 19:13:49 2014 -0500 ---------------------------------------------------------------------- .../vfs/AccumuloReloadingVFSClassLoaderTest.java | 16 +++++++++++----- .../vfs/providers/VfsClassLoaderTest.java | 3 +++ 2 files changed, 14 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
