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/ddd23657 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ddd23657 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ddd23657 Branch: refs/heads/master Commit: ddd23657f2090db4526499a4d2aad37979e5801f Parents: 275d794 dea61a0 Author: Josh Elser <els...@apache.org> Authored: Fri Feb 7 11:22:10 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Fri Feb 7 11:22:10 2014 -0500 ---------------------------------------------------------------------- .../apache/accumulo/proxy/SimpleProxyIT.java | 5 - .../server/conf/TableConfiguration.java | 15 +- .../vfs/providers/VfsClassLoaderTest.java | 6 +- .../org/apache/accumulo/test/ShellServerIT.java | 474 ++++++++++++------- 4 files changed, 310 insertions(+), 190 deletions(-) ----------------------------------------------------------------------
