Merge branch '1.6' 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/724bfb31 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/724bfb31 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/724bfb31 Branch: refs/heads/master Commit: 724bfb3128cc87f5259d43bf41e7559c8ad82619 Parents: 2481323 a2e131b Author: Billie Rinaldi <bil...@apache.org> Authored: Wed Jun 10 18:07:04 2015 -0700 Committer: Billie Rinaldi <bil...@apache.org> Committed: Wed Jun 10 18:07:04 2015 -0700 ---------------------------------------------------------------------- .../conf/CredentialProviderFactoryShim.java | 24 +++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
