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 Wed, 20 Aug 2014 01:36:33 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/fbe6ff36
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fbe6ff36
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fbe6ff36

Branch: refs/heads/master
Commit: fbe6ff36a5158fd449fd293797c07a163c3bd7b8
Parents: c6ed57e 64e5c6a
Author: Josh Elser <elserj@apache.org>
Authored: Tue Aug 19 21:14:09 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Tue Aug 19 21:14:09 2014 -0400

----------------------------------------------------------------------
 .../client/impl/ServerConfigurationUtil.java    |  63 ++++++++++-
 .../accumulo/core/conf/SiteConfiguration.java   |  12 +-
 .../impl/ServerConfigurationUtilTest.java       | 110 +++++++++++++++++++
 .../core/conf/SiteConfigurationTest.java        |   2 +
 4 files changed, 177 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


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


Mime
View raw message