accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject [3/3] git commit: Merge branch '1.6.0-SNAPSHOT'
Date Wed, 08 Jan 2014 20:57:20 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/5f2ddfae
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5f2ddfae
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5f2ddfae

Branch: refs/heads/master
Commit: 5f2ddfae502f508dacdeaa63f671a7c6ebb8214e
Parents: e4eaab8 443cba7
Author: John Vines <vines@apache.org>
Authored: Wed Jan 8 15:57:13 2014 -0500
Committer: John Vines <vines@apache.org>
Committed: Wed Jan 8 15:57:13 2014 -0500

----------------------------------------------------------------------
 conf/examples/crypto/accumulo-site.xml          |   2 +-
 .../org/apache/accumulo/core/conf/Property.java |   3 +
 .../accumulo/core/file/rfile/bcfile/BCFile.java |   9 +-
 .../security/crypto/BlockedInputStream.java     | 174 +++++++++++++++++++
 .../security/crypto/BlockedOutputStream.java    |  96 ++++++++++
 .../security/crypto/CryptoModuleFactory.java    | 111 ++++++------
 .../security/crypto/CryptoModuleParameters.java |  20 ++-
 .../security/crypto/DefaultCryptoModule.java    |  26 ++-
 .../security/crypto/NoFlushOutputStream.java    |  31 ++++
 .../crypto-on-accumulo-site.xml                 | 162 -----------------
 ...rypto-on-no-key-encryption-accumulo-site.xml | 144 ---------------
 .../security/crypto/BlockedIOStreamTest.java    |  74 ++++++++
 .../core/security/crypto/CryptoTest.java        |   4 +-
 .../test/resources/crypto-on-accumulo-site.xml  |   2 +-
 ...rypto-on-no-key-encryption-accumulo-site.xml |   2 +-
 .../accumulo/server/util/TServerUtils.java      |   5 -
 .../accumulo/gc/SimpleGarbageCollector.java     |   9 +-
 .../apache/accumulo/tserver/log/DfsLogger.java  |  13 +-
 .../accumulo/test/functional/ZombieTServer.java |   2 +-
 .../test/performance/thrift/NullTserver.java    |   2 +-
 20 files changed, 492 insertions(+), 399 deletions(-)
----------------------------------------------------------------------


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


Mime
View raw message