Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4060C200BB8 for ; Sat, 8 Oct 2016 01:16:46 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3F3FD160AE8; Fri, 7 Oct 2016 23:16:46 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A4CE4160AF4 for ; Sat, 8 Oct 2016 01:16:45 +0200 (CEST) Received: (qmail 39778 invoked by uid 500); 7 Oct 2016 23:16:44 -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 39668 invoked by uid 99); 7 Oct 2016 23:16:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Oct 2016 23:16:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 900D3E0AD9; Fri, 7 Oct 2016 23:16:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Fri, 07 Oct 2016 23:16:47 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/6] accumulo git commit: Merge branch 'pr-158' into 1.8 archived-at: Fri, 07 Oct 2016 23:16:46 -0000 Merge branch 'pr-158' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/63364d53 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/63364d53 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/63364d53 Branch: refs/heads/master Commit: 63364d53eea0063199d4c3097ac363e5b2414f38 Parents: 91269bf 5e4a8d9 Author: Christopher Tubbs Authored: Fri Oct 7 18:57:32 2016 -0400 Committer: Christopher Tubbs Committed: Fri Oct 7 18:57:32 2016 -0400 ---------------------------------------------------------------------- assemble/conf/examples/crypto/accumulo-site.xml | 6 - .../examples/vfs-classloader/accumulo-site.xml | 9 - assemble/conf/templates/accumulo-site.xml | 9 - .../org/apache/accumulo/core/conf/Property.java | 15 +- .../test/resources/crypto-off-accumulo-site.xml | 6 - .../test/resources/crypto-on-accumulo-site.xml | 6 - ...rypto-on-no-key-encryption-accumulo-site.xml | 6 - .../resources/disabled/conf/accumulo-site.xml | 9 - .../main/asciidoc/chapters/troubleshooting.txt | 2 +- .../impl/MiniAccumuloConfigImpl.java | 1 - .../accumulo/tserver/log/LocalWALRecovery.java | 187 ------------------- .../tserver/log/LocalWALRecoveryTest.java | 100 ---------- test/src/main/resources/conf/accumulo-site.xml | 7 - 13 files changed, 5 insertions(+), 358 deletions(-) ----------------------------------------------------------------------