Repository: accumulo Updated Branches: refs/heads/master 3e64bc999 -> 489c9279c
Merge branch '1.7' of git://git.apache.org/accumulo into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5e71adcb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5e71adcb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5e71adcb Branch: refs/heads/master Commit: 5e71adcb540fcb91ed39c48e5d22186adb77d6ff Parents: b731194 47c64d9 Author: Eric Newton <eric.new...@gmail.com> Authored: Thu Apr 23 10:28:19 2015 -0400 Committer: Eric Newton <eric.new...@gmail.com> Committed: Thu Apr 23 10:28:19 2015 -0400 ---------------------------------------------------------------------- .../accumulo/core/client/ClientConfiguration.java | 8 ++++++-- .../accumulo/core/client/ClientConfigurationTest.java | 13 +++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
