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/17646af6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/17646af6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/17646af6 Branch: refs/heads/master Commit: 17646af60e5275f0254c72d078b7de96cbb51e2d Parents: 302617d afdd2e6 Author: Josh Elser <els...@apache.org> Authored: Thu May 28 23:02:11 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu May 28 23:02:11 2015 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/core/rpc/SaslConnectionParams.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
