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/5605dc7d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5605dc7d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5605dc7d Branch: refs/heads/master Commit: 5605dc7d7454c67d29a4f7f6c3faa112e156c42b Parents: 72bacc8 765099f Author: Eric Newton <[email protected]> Authored: Thu Apr 23 12:03:03 2015 -0400 Committer: Eric Newton <[email protected]> Committed: Thu Apr 23 12:03:03 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/client/ClientConfiguration.java | 2 ++ 1 file changed, 2 insertions(+) ----------------------------------------------------------------------
