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/3fe4f690 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3fe4f690 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3fe4f690 Branch: refs/heads/master Commit: 3fe4f690b59cd9cf33172c5638986c90cb634b9d Parents: a5e4ae8 724bfb3 Author: Billie Rinaldi <bil...@apache.org> Authored: Wed Jun 10 18:10:21 2015 -0700 Committer: Billie Rinaldi <bil...@apache.org> Committed: Wed Jun 10 18:10:21 2015 -0700 ---------------------------------------------------------------------- .../conf/CredentialProviderFactoryShim.java | 24 +++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
