Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ae581d25 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ae581d25 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ae581d25 Branch: refs/heads/1.6 Commit: ae581d25a90f8143611759f0c942e101f5a4f285 Parents: 939c051 7707793 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Wed Mar 4 10:08:22 2015 -0500 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Wed Mar 4 10:08:22 2015 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/core/util/shell/Shell.java | 3 +++ .../core/util/shell/ShellSetInstanceTest.java | 4 ++++ pom.xml | 4 ++-- .../start/classloader/AccumuloClassLoader.java | 15 +++++++++------ 4 files changed, 18 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
