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/7d9373b6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7d9373b6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7d9373b6 Branch: refs/heads/master Commit: 7d9373b61d007bf6d41511d6b81ff9eb7b1a9841 Parents: 3353a45 f841082 Author: Josh Elser <els...@apache.org> Authored: Mon Oct 20 19:19:29 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon Oct 20 19:19:29 2014 -0400 ---------------------------------------------------------------------- .../conf/CredentialProviderFactoryShimTest.java | 25 ++++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
