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/af151d69 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/af151d69 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/af151d69 Branch: refs/heads/master Commit: af151d69893fc2f864b77b42ee97742d0af8f89b Parents: c95030c 9f56374 Author: Josh Elser <[email protected]> Authored: Fri Jan 10 19:14:33 2014 -0500 Committer: Josh Elser <[email protected]> Committed: Fri Jan 10 19:14:33 2014 -0500 ---------------------------------------------------------------------- .../classloader/vfs/AccumuloVFSClassLoader.java | 8 +++--- .../classloader/vfs/UniqueFileReplicator.java | 26 ++++++++++---------- 2 files changed, 18 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
