Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a81e6170 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a81e6170 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a81e6170 Branch: refs/heads/master Commit: a81e6170cdaccc200925676001037759e677fdb2 Parents: 3a05a5d f47fdfe Author: Josh Elser <els...@apache.org> Authored: Fri Feb 27 18:24:15 2015 -0500 Committer: Josh Elser <els...@apache.org> Committed: Fri Feb 27 18:24:15 2015 -0500 ---------------------------------------------------------------------- .../start/classloader/AccumuloClassLoader.java | 22 ++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/a81e6170/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java ----------------------------------------------------------------------