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/4dfdc354 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4dfdc354 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4dfdc354 Branch: refs/heads/master Commit: 4dfdc35443c716724525120fca5fd2cf448d60c5 Parents: 44d4cef 3ef67cb Author: Keith Turner <ktur...@apache.org> Authored: Tue Mar 18 14:13:34 2014 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Tue Mar 18 14:13:34 2014 -0400 ---------------------------------------------------------------------- .../core/util/shell/commands/ConfigCommand.java | 2 +- .../org/apache/accumulo/test/ShellConfigIT.java | 52 + .../org/apache/accumulo/test/ShellServerIT.java | 943 ++++++++++--------- 3 files changed, 529 insertions(+), 468 deletions(-) ----------------------------------------------------------------------
