Merge remote-tracking branch 'origin/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/b05d459b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b05d459b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b05d459b Branch: refs/heads/master Commit: b05d459b9d29826a1d99c2b826cb333a1747f3db Parents: ba494bd 43bf128 Author: John Vines <[email protected]> Authored: Tue Feb 4 14:01:52 2014 -0500 Committer: John Vines <[email protected]> Committed: Tue Feb 4 14:01:52 2014 -0500 ---------------------------------------------------------------------- .../apache/accumulo/core/cli/ClientOpts.java | 5 +- .../accumulo/test/functional/ExamplesIT.java | 66 ++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
