accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [3/3] git commit: Merge branch '1.6.1-SNAPSHOT'
Date Tue, 05 Aug 2014 19:49:31 GMT
Merge branch '1.6.1-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f5984b35
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f5984b35
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f5984b35

Branch: refs/heads/master
Commit: f5984b35abf87541d1f3410b4d837d244de756f0
Parents: 440281b 0b89292
Author: Josh Elser <elserj@apache.org>
Authored: Tue Aug 5 15:47:55 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Tue Aug 5 15:47:55 2014 -0400

----------------------------------------------------------------------
 .../accumulo/core/conf/SiteConfiguration.java   |  11 ++-
 .../core/conf/SiteConfigurationTest.java        |  74 +++++++++++++++++++
 .../accumulo-credentialprovider-site.xml        |  26 +++++++
 core/src/test/resources/site-cfg.jceks          | Bin 0 -> 1441 bytes
 4 files changed, 109 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


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


Mime
View raw message