You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by el...@apache.org on 2015/10/19 00:58:58 UTC

[4/8] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7

Conflicts:
	core/src/test/java/org/apache/accumulo/core/client/ClientConfigurationTest.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/208a1032
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/208a1032
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/208a1032

Branch: refs/heads/1.7
Commit: 208a10322579cf726e7ec1eb5227ee4e09303681
Parents: 0c3dc17 3f1346c
Author: Josh Elser <el...@apache.org>
Authored: Sun Oct 18 18:41:13 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun Oct 18 18:41:13 2015 -0400

----------------------------------------------------------------------
 .../core/client/ClientConfiguration.java        |  21 +++-
 .../core/client/ClientConfigurationTest.java    | 105 ++++++-------------
 2 files changed, 51 insertions(+), 75 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/208a1032/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
----------------------------------------------------------------------