You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2015/05/26 17:53:35 UTC

[11/12] accumulo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25991cfc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25991cfc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/25991cfc

Branch: refs/heads/master
Commit: 25991cfcaa23c862f0f64f4dccefbb3abfeb0b16
Parents: 2498a5f 43c3831
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue May 26 11:37:12 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue May 26 11:37:12 2015 -0400

----------------------------------------------------------------------
 CHANGES                                         |    4 +
 DEPENDENCIES                                    |   21 +
 UPGRADING.md                                    |  106 +
 assemble/bin/accumulo                           |    1 -
 assemble/bin/config.sh                          |    6 +-
 assemble/bin/start-server.sh                    |    4 +-
 assemble/bin/stop-here.sh                       |    2 +-
 assemble/build.sh                               |    9 +-
 .../core/client/impl/ConditionalWriterImpl.java |    2 +-
 .../mapreduce/lib/util/ConfiguratorBase.java    |  277 +++
 .../lib/util/FileOutputConfigurator.java        |  170 ++
 .../mapreduce/lib/util/InputConfigurator.java   |  462 +++++
 .../mapreduce/lib/util/OutputConfigurator.java  |  196 ++
 .../client/mapreduce/lib/util/package-info.java |   22 +
 .../org/apache/accumulo/core/conf/Property.java |    4 +-
 .../accumulo/core/file/rfile/bcfile/Utils.java  |    2 +-
 .../iterators/user/IntersectingIterator.java    |   19 +-
 .../core/metadata/schema/MetadataSchema.java    |   47 -
 .../mapred/AccumuloFileOutputFormatTest.java    |    2 +
 .../mapreduce/AccumuloFileOutputFormatTest.java |    2 +
 .../core/metadata/MetadataTableSchemaTest.java  |   47 -
 .../main/asciidoc/chapters/administration.txt   |    2 +-
 docs/src/main/asciidoc/chapters/kerberos.txt    |   83 +-
 .../accumulo/examples/simple/shard/Index.java   |    7 +-
 minicluster/pom.xml                             |   10 +
 .../standalone/StandaloneAccumuloCluster.java   |   33 +-
 .../standalone/StandaloneClusterControl.java    |   84 +-
 .../minicluster/MiniAccumuloRunner.java         |    4 +
 .../impl/MiniAccumuloClusterImpl.java           |   76 +-
 .../impl/MiniAccumuloConfigImpl.java            |   45 +-
 .../StandaloneAccumuloClusterTest.java          |   53 +
 .../StandaloneClusterControlTest.java           |   82 +
 ...niAccumuloClusterExistingZooKeepersTest.java |  107 +
 pom.xml                                         |   52 +-
 .../java/org/apache/accumulo/proxy/Proxy.java   |    5 +
 .../apache/accumulo/proxy/TestProxyClient.java  |  175 --
 .../server/GarbageCollectionLogger.java         |  116 ++
 .../apache/accumulo/server/init/Initialize.java |    4 +-
 .../accumulo/server/log/WalStateManager.java    |  218 ++
 .../server/master/state/MetaDataStateStore.java |   29 -
 .../server/master/state/TServerInstance.java    |   14 +-
 .../server/master/state/TabletStateStore.java   |    6 -
 .../master/state/ZooTabletStateStore.java       |   10 -
 .../server/security/SystemCredentials.java      |    2 +-
 .../tabletserver/LargestFirstMemoryManager.java |    2 +-
 .../accumulo/server/util/ListVolumesUsed.java   |   13 +-
 .../accumulo/server/util/MetadataTableUtil.java |  138 --
 .../accumulo/server/util/SendLogToChainsaw.java |    2 +-
 .../server/zookeeper/TransactionWatcher.java    |   21 +
 .../gc/GarbageCollectWriteAheadLogs.java        |  439 ++--
 .../CloseWriteAheadLogReferences.java           |   58 +-
 .../gc/GarbageCollectWriteAheadLogsTest.java    |  259 ++-
 .../CloseWriteAheadLogReferencesTest.java       |  132 --
 .../accumulo/master/TabletGroupWatcher.java     |   14 +-
 .../org/apache/accumulo/monitor/util/Table.java |    2 +-
 .../monitor/util/celltypes/NumberType.java      |    2 +-
 server/native/pom.xml                           |    4 +
 .../server/GarbageCollectionLogger.java         |  116 --
 .../apache/accumulo/tserver/FileManager.java    |    2 +-
 .../apache/accumulo/tserver/TabletServer.java   |   42 +-
 .../accumulo/tserver/log/LocalWALRecovery.java  |   75 +-
 .../tserver/log/TabletServerLogger.java         |    9 +-
 .../tserver/tablet/BulkImportCacheCleaner.java  |   60 +
 .../apache/accumulo/tserver/tablet/Tablet.java  |   16 +-
 .../LargestFirstMemoryManagerTest.java          |  294 ---
 .../tserver/LargestFirstMemoryManagerTest.java  |  298 +++
 .../accumulo/tserver/tablet/RootFilesTest.java  |    7 +-
 .../shell/commands/FormatterCommandTest.java    |    2 +-
 .../java/org/apache/accumulo/start/Main.java    |    4 +-
 .../start/classloader/AccumuloClassLoader.java  |    7 +-
 .../classloader/vfs/UniqueFileReplicator.java   |    3 +-
 .../providers/ReadOnlyHdfsFileProviderTest.java |    2 +-
 .../vfs/providers/VfsClassLoaderTest.java       |    2 +-
 .../accumulo/start/test/AccumuloDFSBase.java    |  130 ++
 .../apache/accumulo/test/AccumuloDFSBase.java   |  130 --
 .../accumulo/test/continuous/TimeBinner.java    |    3 +
 .../test/continuous/UndefinedAnalyzer.java      |   84 +-
 .../test/functional/CacheTestWriter.java        |    3 +
 .../apache/accumulo/test/randomwalk/Node.java   |   16 +-
 .../test/randomwalk/multitable/CopyTable.java   |    3 +
 .../test/randomwalk/multitable/CopyTool.java    |   54 +-
 .../accumulo/fate/zookeeper/ZooLockTest.java    |  379 ----
 .../accumulo/harness/AccumuloClusterIT.java     |    3 +-
 .../StandaloneAccumuloClusterConfiguration.java |   11 +-
 .../accumulo/proxy/ProxyDurabilityIT.java       |  144 --
 .../apache/accumulo/proxy/SimpleProxyBase.java  | 1619 ---------------
 .../apache/accumulo/proxy/TBinaryProxyIT.java   |   33 -
 .../apache/accumulo/proxy/TCompactProxyIT.java  |   33 -
 .../accumulo/proxy/TJsonProtocolProxyIT.java    |   33 -
 .../apache/accumulo/proxy/TTupleProxyIT.java    |   33 -
 .../proxy/TestProxyInstanceOperations.java      |   83 -
 .../accumulo/proxy/TestProxyReadWrite.java      |  466 -----
 .../proxy/TestProxySecurityOperations.java      |  146 --
 .../proxy/TestProxyTableOperations.java         |  201 --
 .../server/security/SystemCredentialsIT.java    |  232 ---
 .../apache/accumulo/start/KeywordStartIT.java   |  196 --
 .../apache/accumulo/test/AuditMessageIT.java    |    5 +-
 .../apache/accumulo/test/ImportExportIT.java    |   18 +-
 .../org/apache/accumulo/test/UnusedWALIT.java   |   17 +-
 .../java/org/apache/accumulo/test/VolumeIT.java |   23 +-
 .../test/fate/zookeeper/ZooLockTest.java        |  381 ++++
 .../accumulo/test/functional/CleanTmpIT.java    |   12 +-
 .../accumulo/test/functional/ConstraintIT.java  |   24 +-
 .../accumulo/test/functional/DurabilityIT.java  |   44 +-
 .../accumulo/test/functional/WALSunnyDayIT.java |   28 +-
 .../performance/metadata/FastBulkImportIT.java  |    2 +-
 .../accumulo/test/proxy/ProxyDurabilityIT.java  |  145 ++
 .../accumulo/test/proxy/SimpleProxyBase.java    | 1906 ++++++++++++++++++
 .../accumulo/test/proxy/TBinaryProxyIT.java     |   33 +
 .../accumulo/test/proxy/TCompactProxyIT.java    |   32 +
 .../test/proxy/TJsonProtocolProxyIT.java        |   33 +
 .../accumulo/test/proxy/TTupleProxyIT.java      |   33 +
 .../accumulo/test/proxy/TestProxyClient.java    |  176 ++
 .../test/proxy/TestProxyInstanceOperations.java |   84 +
 .../accumulo/test/proxy/TestProxyReadWrite.java |  468 +++++
 .../test/proxy/TestProxySecurityOperations.java |  147 ++
 .../test/proxy/TestProxyTableOperations.java    |  202 ++
 ...bageCollectorCommunicatesWithTServersIT.java |   22 +-
 .../test/replication/ReplicationIT.java         |  134 +-
 .../server/security/SystemCredentialsIT.java    |  233 +++
 .../accumulo/test/start/KeywordStartIT.java     |  197 ++
 121 files changed, 7450 insertions(+), 5631 deletions(-)
----------------------------------------------------------------------