Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D41E8102F3 for ; Wed, 8 Jan 2014 20:57:18 +0000 (UTC) Received: (qmail 81938 invoked by uid 500); 8 Jan 2014 20:57:18 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 81895 invoked by uid 500); 8 Jan 2014 20:57:18 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 81842 invoked by uid 99); 8 Jan 2014 20:57:18 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jan 2014 20:57:18 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 800C054F34; Wed, 8 Jan 2014 20:57:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vines@apache.org To: commits@accumulo.apache.org Date: Wed, 08 Jan 2014 20:57:20 -0000 Message-Id: <87a29950bbcf4a0aba282c009b14bc69@git.apache.org> In-Reply-To: <01eab78d0ab54ea9a783a0aa4f1334da@git.apache.org> References: <01eab78d0ab54ea9a783a0aa4f1334da@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch '1.6.0-SNAPSHOT' 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 Authored: Wed Jan 8 15:57:13 2014 -0500 Committer: John Vines 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 ----------------------------------------------------------------------