This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 7112c07bdd1ae1949f3b127255abf583a10d8b6a Merge: cd566a9 2d9f12e Author: Christopher Tubbs <[email protected]> AuthorDate: Sat Jun 15 21:51:16 2019 -0400 Merge branch '2.0' .../apache/accumulo/core/conf/CredentialProviderFactoryShimTest.java | 2 +- .../org/apache/accumulo/core/file/BloomFilterLayerLookupTest.java | 3 +-- .../org/apache/accumulo/core/file/rfile/MultiThreadedRFileTest.java | 1 + .../java/org/apache/accumulo/core/file/rfile/RFileMetricsTest.java | 3 +++ core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java | 3 +++ .../apache/accumulo/hadoop/its/mapred/AccumuloFileOutputFormatIT.java | 3 +++ .../test/java/org/apache/accumulo/hadoop/its/mapred/TokenFileIT.java | 1 + .../accumulo/hadoop/its/mapreduce/AccumuloFileOutputFormatIT.java | 3 +++ .../java/org/apache/accumulo/hadoop/its/mapreduce/TokenFileIT.java | 1 + .../org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java | 2 +- .../minicluster/MiniAccumuloClusterExistingZooKeepersTest.java | 2 +- .../apache/accumulo/minicluster/MiniAccumuloClusterStartStopTest.java | 2 +- .../java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java | 3 +++ .../org/apache/accumulo/miniclusterImpl/CleanShutdownMacTest.java | 3 +++ .../apache/accumulo/miniclusterImpl/MiniAccumuloClusterImplTest.java | 3 +++ .../apache/accumulo/miniclusterImpl/MiniAccumuloConfigImplTest.java | 3 +++ .../src/test/java/org/apache/accumulo/server/ServerConstantsTest.java | 3 +++ .../src/test/java/org/apache/accumulo/server/fs/VolumeUtilTest.java | 3 +++ .../src/test/java/org/apache/accumulo/server/util/FileUtilTest.java | 3 +++ .../src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java | 3 +++ .../java/org/apache/accumulo/tserver/log/RecoveryLogsReaderTest.java | 3 +++ .../java/org/apache/accumulo/tserver/log/SortedLogRecoveryTest.java | 3 +++ .../org/apache/accumulo/tserver/log/TestUpgradePathForWALogs.java | 3 +-- .../test/java/org/apache/accumulo/tserver/tablet/RootFilesTest.java | 3 +++ shell/src/main/java/org/apache/accumulo/shell/Shell.java | 2 ++ shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java | 2 ++ shell/src/test/java/org/apache/accumulo/shell/ShellUtilTest.java | 3 +++ .../start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java | 3 +++ .../accumulo/start/classloader/vfs/AccumuloVFSClassLoaderTest.java | 3 +++ .../org/apache/accumulo/start/classloader/vfs/ContextManagerTest.java | 3 +++ .../src/test/java/org/apache/accumulo/start/test/AccumuloDFSBase.java | 3 +++ .../apache/accumulo/test/ThriftServerBindsBeforeZooKeeperLockIT.java | 1 + .../java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java | 2 ++ test/src/main/spotbugs/exclude-filter.xml | 4 ++++ 34 files changed, 80 insertions(+), 8 deletions(-)
