Merge branch '1.7' of http://git-wip-us.apache.org/repos/asf/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/765099f2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/765099f2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/765099f2 Branch: refs/heads/master Commit: 765099f26106d69009e1ba782b1203c5069d2103 Parents: f41a253 f220709 Author: Eric Newton <[email protected]> Authored: Thu Apr 23 12:02:55 2015 -0400 Committer: Eric Newton <[email protected]> Committed: Thu Apr 23 12:02:55 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/client/ClientConfiguration.java | 2 ++ 1 file changed, 2 insertions(+) ----------------------------------------------------------------------
