accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwa...@apache.org
Subject [accumulo] 04/04: Merge branch 'accumulo-properties'
Date Fri, 31 Aug 2018 15:05:44 GMT
This is an automated email from the ASF dual-hosted git repository.

mwalch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 4b8ca69e319ec96af4d0db8f8933fbceb89e27f4
Merge: 80bb2f3 ec35002
Author: Mike Walch <mwalch@apache.org>
AuthorDate: Fri Aug 31 11:04:46 2018 -0400

    Merge branch 'accumulo-properties'

 INSTALL.md                                         |   4 +-
 assemble/bin/accumulo-util                         |  32 ++----
 assemble/conf/accumulo-site.xml                    |  51 ---------
 assemble/conf/accumulo.properties                  |  36 +++++++
 .../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 -----
 core/src/test/resources/accumulo.properties        |  16 +++
 .../test/resources/crypto-off-accumulo-site.xml    |  74 -------------
 .../src/test/resources/crypto-on-accumulo-site.xml |  72 -------------
 .../test/resources/crypto-on-accumulo.properties   |  18 ++++
 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 ------
 server/base/src/test/resources/accumulo.properties |  19 ++++
 server/gc/src/test/resources/accumulo-site.xml     |  24 -----
 server/gc/src/test/resources/accumulo.properties   |  16 +++
 server/master/src/test/resources/accumulo-site.xml |  24 -----
 .../master/src/test/resources/accumulo.properties  |  16 +++
 .../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, 502 insertions(+), 741 deletions(-)


Mime
View raw message