From commits-return-22060-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Fri Aug 31 17:05:43 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 9FC4F180663 for ; Fri, 31 Aug 2018 17:05:42 +0200 (CEST) Received: (qmail 5890 invoked by uid 500); 31 Aug 2018 15:05:41 -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 5875 invoked by uid 99); 31 Aug 2018 15:05:41 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Aug 2018 15:05:41 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 2922E8510B; Fri, 31 Aug 2018 15:05:41 +0000 (UTC) Date: Fri, 31 Aug 2018 15:05:40 +0000 To: , "' commits@accumulo.apache.org" , '@gitbox.apache.org, Subject: [accumulo] branch master updated (80bb2f3 -> 4b8ca69) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <153572794082.9612.4816391440093821955@gitbox.apache.org> From: mwalch@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 80bb2f387e4b00867abb3cfe8c133b6dffcb21bb X-Git-Newrev: 4b8ca69e319ec96af4d0db8f8933fbceb89e27f4 X-Git-NotificationType: ref_changed X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. mwalch pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 80bb2f3 Removed duplicate calls and implementation of SecureRandom (#617) new b5ea706 Converted accumulo-site.xml from XML to properties file (#623) new 173b8f9 Use streams to remove warnings new ec35002 Code review updates for PR #623 new 4b8ca69 Merge branch 'accumulo-properties' The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: INSTALL.md | 4 +- assemble/bin/accumulo-util | 32 ++---- assemble/conf/accumulo-site.xml | 51 --------- .../accumulo.properties} | 27 +++-- .../core/client/mapreduce/InputTableConfig.java | 4 +- .../org/apache/accumulo/core/cli/ConfigOpts.java | 16 +-- .../core/client/admin/InstanceOperations.java | 10 +- .../core/client/impl/ClientConfConverter.java | 2 +- .../accumulo/core/conf/ConfigurationDocGen.java | 4 +- .../org/apache/accumulo/core/conf/Property.java | 2 +- .../accumulo/core/conf/SiteConfiguration.java | 120 ++++++++++++--------- .../accumulo/core/volume/NonConfiguredVolume.java | 14 +-- .../apache/accumulo/core/file/rfile/RFileTest.java | 57 +++++----- .../accumulo/core/security/crypto/CryptoTest.java | 18 ++-- .../resources/accumulo-credentialprovider-site.xml | 26 ----- core/src/test/resources/accumulo-site.xml | 24 ----- .../src/test/resources/accumulo.properties | 4 +- .../test/resources/crypto-off-accumulo-site.xml | 74 ------------- .../src/test/resources/crypto-on-accumulo-site.xml | 72 ------------- .../test/resources/crypto-on-accumulo.properties | 16 +-- minicluster/pom.xml | 4 + .../apache/accumulo/cluster/AccumuloCluster.java | 8 +- .../standalone/StandaloneAccumuloCluster.java | 6 +- .../accumulo/minicluster/MiniAccumuloConfig.java | 2 +- .../accumulo/minicluster/MiniAccumuloInstance.java | 16 +-- .../accumulo/minicluster/MiniAccumuloRunner.java | 8 +- .../minicluster/impl/MiniAccumuloClusterImpl.java | 16 +-- .../minicluster/impl/MiniAccumuloConfigImpl.java | 27 +++-- .../minicluster/MiniAccumuloClusterTest.java | 10 +- .../apache/accumulo/server/init/Initialize.java | 18 ++-- .../org/apache/accumulo/server/util/Admin.java | 22 ++-- .../apache/accumulo/server/util/ChangeSecret.java | 2 +- .../accumulo/server/util/CleanZookeeper.java | 2 +- .../apache/accumulo/server/util/ConvertConfig.java | 100 +++++++++++++++++ server/base/src/test/resources/accumulo-site.xml | 32 ------ .../base/src/test/resources/accumulo.properties | 13 +-- server/gc/src/test/resources/accumulo-site.xml | 24 ----- .../gc/src/test/resources/accumulo.properties | 4 +- server/master/src/test/resources/accumulo-site.xml | 24 ----- .../master/src/test/resources/accumulo.properties | 4 +- .../org/apache/accumulo/tserver/NativeMap.java | 2 +- .../org/apache/accumulo/tserver/TabletServer.java | 2 +- .../tserver/src/test/resources/accumulo-site.xml | 24 ----- shell/src/test/resources/accumulo-site.xml | 28 ----- start/pom.xml | 4 + .../start/classloader/AccumuloClassLoader.java | 42 ++------ .../vfs/AccumuloVFSClassLoaderTest.java | 61 +++-------- .../org/apache/accumulo/test/DumpConfigIT.java | 2 +- .../org/apache/accumulo/test/ExistingMacIT.java | 6 +- .../accumulo/test/RewriteTabletDirectoriesIT.java | 15 +-- .../org/apache/accumulo/test/ShellConfigIT.java | 2 +- .../java/org/apache/accumulo/test/VolumeIT.java | 56 ++++------ .../accumulo/test/functional/ReadWriteIT.java | 16 +-- .../apache/accumulo/test/start/KeywordStartIT.java | 2 + .../org/apache/accumulo/test/util/CertUtils.java | 9 +- 55 files changed, 411 insertions(+), 779 deletions(-) delete mode 100644 assemble/conf/accumulo-site.xml copy assemble/{src/main/scripts/generate-versions-listing.sh => conf/accumulo.properties} (51%) mode change 100755 => 100644 delete mode 100644 core/src/test/resources/accumulo-credentialprovider-site.xml delete mode 100644 core/src/test/resources/accumulo-site.xml copy test/src/main/resources/shellit.txt => core/src/test/resources/accumulo.properties (95%) delete mode 100644 core/src/test/resources/crypto-off-accumulo-site.xml delete mode 100644 core/src/test/resources/crypto-on-accumulo-site.xml copy .gitignore => core/src/test/resources/crypto-on-accumulo.properties (81%) create mode 100644 server/base/src/main/java/org/apache/accumulo/server/util/ConvertConfig.java delete mode 100644 server/base/src/test/resources/accumulo-site.xml copy iterator-test-harness/.gitignore => server/base/src/test/resources/accumulo.properties (85%) delete mode 100644 server/gc/src/test/resources/accumulo-site.xml copy test/src/main/resources/shellit.txt => server/gc/src/test/resources/accumulo.properties (95%) delete mode 100644 server/master/src/test/resources/accumulo-site.xml copy test/src/main/resources/shellit.txt => server/master/src/test/resources/accumulo.properties (95%) delete mode 100644 server/tserver/src/test/resources/accumulo-site.xml delete mode 100644 shell/src/test/resources/accumulo-site.xml