accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject [2/2] git commit: Merge branch '1.6.0-SNAPSHOT'
Date Fri, 24 Jan 2014 05:04:32 GMT
Merge branch '1.6.0-SNAPSHOT'


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

Branch: refs/heads/master
Commit: 6991509cc5a0ac6228e7fb7b880bb69dae29102d
Parents: 129deb7 11d803c
Author: Keith Turner <kturner@apache.org>
Authored: Fri Jan 24 00:09:20 2014 -0500
Committer: Keith Turner <kturner@apache.org>
Committed: Fri Jan 24 00:09:20 2014 -0500

----------------------------------------------------------------------
 .../org/apache/accumulo/core/conf/Property.java |   5 +-
 .../impl/MiniAccumuloConfigImpl.java            |   2 +-
 .../org/apache/accumulo/server/Accumulo.java    |  10 +-
 .../apache/accumulo/server/ServerConstants.java |  98 +++++++++++----
 .../accumulo/server/fs/VolumeManager.java       |   3 -
 .../accumulo/server/fs/VolumeManagerImpl.java   |  13 +-
 .../apache/accumulo/server/init/Initialize.java |  82 ++++++++++---
 .../accumulo/server/ServerConstantsTest.java    | 113 +++++++++++++++++
 .../accumulo/server/init/InitializeTest.java    |   1 +
 .../server/security/SystemCredentialsTest.java  |   9 +-
 .../tserver/TabletServerSyncCheckTest.java      |   5 -
 .../accumulo/tserver/log/MultiReaderTest.java   |   2 +-
 .../java/org/apache/accumulo/test/VolumeIT.java | 123 +++++++++++++++++++
 13 files changed, 407 insertions(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6991509c/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------


Mime
View raw message