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/dd01cbfa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dd01cbfa Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dd01cbfa Branch: refs/heads/master Commit: dd01cbfaea002cf3c736304fd045948add067aeb Parents: 58cfee8 47c64d9 Author: Billie Rinaldi <bil...@apache.org> Authored: Thu Apr 23 06:42:46 2015 -0700 Committer: Billie Rinaldi <bil...@apache.org> Committed: Thu Apr 23 06:42:46 2015 -0700 ---------------------------------------------------------------------- .../accumulo/core/client/ClientConfiguration.java | 8 ++++++-- .../accumulo/core/client/ClientConfigurationTest.java | 13 +++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
