Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7f5bd5f5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7f5bd5f5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7f5bd5f5 Branch: refs/heads/master Commit: 7f5bd5f5a8c3f72f6ce82726077d3e806e1f2f27 Parents: ec745ff b178784 Author: John Vines <vi...@apache.org> Authored: Thu Jan 30 18:56:19 2014 -0500 Committer: John Vines <vi...@apache.org> Committed: Thu Jan 30 18:56:19 2014 -0500 ---------------------------------------------------------------------- .../core/client/ClientConfiguration.java | 115 ++++++++++++++++++- 1 file changed, 110 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
