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/5312fac1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5312fac1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5312fac1 Branch: refs/heads/1.7 Commit: 5312fac1ce3cede1f6e4464f8b0ebc04cb2f355d Parents: 724bfb3 df67ad2 Author: Billie Rinaldi <bil...@apache.org> Authored: Thu Jun 11 13:29:00 2015 -0700 Committer: Billie Rinaldi <bil...@apache.org> Committed: Thu Jun 11 13:29:00 2015 -0700 ---------------------------------------------------------------------- .../conf/CredentialProviderFactoryShim.java | 24 +++++++++----------- 1 file changed, 11 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
