Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0b4b694d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0b4b694d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0b4b694d Branch: refs/heads/master Commit: 0b4b694d47cdad5ab93c896427691e058a737e64 Parents: 93a3d5c a323f03 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Tue Feb 10 20:04:27 2015 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue Feb 10 20:04:27 2015 -0500 ---------------------------------------------------------------------- .../core/client/security/tokens/CredentialProviderToken.java | 4 ++-- .../apache/accumulo/core/conf/CredentialProviderFactoryShim.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
