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/de715e70 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/de715e70 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/de715e70 Branch: refs/heads/master Commit: de715e70e2103e4a1ba6cb28efef8c447826dcd4 Parents: 5605dc7 d04487b Author: Billie Rinaldi <[email protected]> Authored: Thu Apr 23 13:58:03 2015 -0700 Committer: Billie Rinaldi <[email protected]> Committed: Thu Apr 23 13:58:03 2015 -0700 ---------------------------------------------------------------------- .../accumulo/core/client/ClientConfiguration.java | 14 +++++++------- .../accumulo/core/client/ClientConfigurationTest.java | 8 ++++---- core/src/test/resources/multi-valued.client.conf | 2 +- .../accumulo/minicluster/MiniAccumuloInstance.java | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
