Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7d2eb671 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7d2eb671 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7d2eb671 Branch: refs/heads/master Commit: 7d2eb6711632c3766fe42d64c160b8687e08ca45 Parents: 321f573 61b76b5 Author: Billie Rinaldi <bil...@apache.org> Authored: Tue Apr 21 12:42:06 2015 -0700 Committer: Billie Rinaldi <bil...@apache.org> Committed: Tue Apr 21 12:42:06 2015 -0700 ---------------------------------------------------------------------- .../apache/accumulo/core/cli/ClientOpts.java | 5 +- .../core/client/ClientConfiguration.java | 42 +++++++++++++++- .../core/client/ClientConfigurationTest.java | 51 ++++++++++++++++++-- .../src/test/resources/multi-valued.client.conf | 17 +++++++ .../minicluster/MiniAccumuloInstance.java | 5 +- .../org/apache/accumulo/proxy/ProxyServer.java | 3 +- .../apache/accumulo/shell/ShellOptionsJC.java | 4 +- .../StandaloneAccumuloClusterConfiguration.java | 3 +- .../org/apache/accumulo/test/ShellServerIT.java | 3 +- .../test/functional/ConfigurableMacIT.java | 3 +- 10 files changed, 116 insertions(+), 20 deletions(-) ----------------------------------------------------------------------