You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2016/10/07 23:16:47 UTC
[4/6] accumulo git commit: Merge branch 'pr-158' into 1.8
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 <ct...@apache.org>
Authored: Fri Oct 7 18:57:32 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
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(-)
----------------------------------------------------------------------