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/217264f1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/217264f1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/217264f1 Branch: refs/heads/master Commit: 217264f139e7b4b90f27e2a00f0fe83cd1aaa483 Parents: af59921 1b5c054 Author: Bill Havanki <bhava...@cloudera.com> Authored: Thu Jan 16 22:58:08 2014 -0500 Committer: Bill Havanki <bhava...@cloudera.com> Committed: Thu Jan 16 22:58:08 2014 -0500 ---------------------------------------------------------------------- conf/examples/crypto/accumulo-site.xml | 2 +- .../security/crypto/BlockedOutputStream.java | 6 +- .../CachingHDFSSecretKeyEncryptionStrategy.java | 3 + .../security/crypto/CryptoModuleFactory.java | 4 +- .../security/crypto/CryptoModuleParameters.java | 2 +- .../security/crypto/DefaultCryptoModule.java | 4 +- .../DefaultSecretKeyEncryptionStrategy.java | 188 ------------------- .../NonCachingSecretKeyEncryptionStrategy.java | 188 +++++++++++++++++++ .../security/crypto/BlockedIOStreamTest.java | 44 +++++ .../core/security/crypto/CryptoTest.java | 8 +- .../test/resources/crypto-on-accumulo-site.xml | 2 +- .../apache/accumulo/tserver/log/DfsLogger.java | 12 +- .../test/randomwalk/security/CreateUser.java | 1 + 13 files changed, 257 insertions(+), 207 deletions(-) ----------------------------------------------------------------------
