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/455b99aa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/455b99aa Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/455b99aa Branch: refs/heads/master Commit: 455b99aa050c00e28db2856fea42aef6888168ee Parents: 3fe4f69 5312fac Author: Billie Rinaldi <bil...@apache.org> Authored: Thu Jun 11 13:30:00 2015 -0700 Committer: Billie Rinaldi <bil...@apache.org> Committed: Thu Jun 11 13:30:00 2015 -0700 ---------------------------------------------------------------------- .../conf/CredentialProviderFactoryShim.java | 24 +++++++++----------- 1 file changed, 11 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
