accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [7/7] git commit: Merge branch '1.6'
Date Mon, 20 Oct 2014 22:03:32 GMT
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/3353a459
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3353a459
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3353a459

Branch: refs/heads/master
Commit: 3353a45962903e004ede11b4aa7ba284e00a0b83
Parents: 8bea7ab 5f29c9f
Author: Josh Elser <elserj@apache.org>
Authored: Mon Oct 20 17:43:43 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Mon Oct 20 17:43:43 2014 -0400

----------------------------------------------------------------------
 core/pom.xml                                    |  5 ++
 .../tokens/CredentialProviderToken.java         |  3 +-
 .../conf/CredentialProviderFactoryShim.java     | 16 +++-
 .../accumulo/core/conf/SiteConfiguration.java   |  3 +-
 .../conf/CredentialProviderFactoryShimTest.java | 91 +++++++++++++-------
 .../accumulo/fate/zookeeper/ZooCache.java       |  2 +-
 .../apache/accumulo/fate/zookeeper/ZooUtil.java | 70 +++++++++++++--
 .../zookeeper/ZooKeeperConnectionInfoTest.java  | 31 +++++++
 .../accumulo/test/KeyValueEqualityTest.java     | 31 ++-----
 9 files changed, 185 insertions(+), 67 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3353a459/core/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3353a459/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3353a459/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
----------------------------------------------------------------------


Mime
View raw message