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:33 UTC
[09/12] accumulo git commit: Merge branch '1.7' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.7
Merge branch '1.7' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9840938f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9840938f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9840938f
Branch: refs/heads/master
Commit: 9840938ff5b7d489da28336bdc0181133a6304e4
Parents: 9b1620c 24ea8d1
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue May 26 11:36:55 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue May 26 11:36:55 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/pom.xml | 2 +-
core/pom.xml | 2 +-
.../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 +
.../accumulo/core/file/rfile/bcfile/Utils.java | 2 +-
.../iterators/user/IntersectingIterator.java | 19 +-
.../mapred/AccumuloFileOutputFormatTest.java | 2 +
.../mapreduce/AccumuloFileOutputFormatTest.java | 2 +
docs/pom.xml | 2 +-
.../main/asciidoc/chapters/administration.txt | 2 +-
docs/src/main/asciidoc/chapters/kerberos.txt | 83 +-
examples/simple/pom.xml | 2 +-
.../accumulo/examples/simple/shard/Index.java | 7 +-
fate/pom.xml | 2 +-
maven-plugin/pom.xml | 2 +-
minicluster/pom.xml | 2 +-
.../standalone/StandaloneAccumuloCluster.java | 33 +-
.../standalone/StandaloneClusterControl.java | 84 +-
.../impl/MiniAccumuloClusterImpl.java | 17 +-
.../impl/MiniAccumuloConfigImpl.java | 8 +-
.../StandaloneAccumuloClusterTest.java | 53 +
.../StandaloneClusterControlTest.java | 82 ++
pom.xml | 12 +-
proxy/pom.xml | 2 +-
.../java/org/apache/accumulo/proxy/Proxy.java | 5 +
server/base/pom.xml | 2 +-
.../server/GarbageCollectionLogger.java | 116 ++
.../apache/accumulo/server/init/Initialize.java | 2 +-
.../accumulo/server/util/SendLogToChainsaw.java | 2 +-
server/gc/pom.xml | 2 +-
server/master/pom.xml | 2 +-
server/monitor/pom.xml | 2 +-
.../org/apache/accumulo/monitor/util/Table.java | 2 +-
.../monitor/util/celltypes/NumberType.java | 2 +-
server/native/pom.xml | 6 +-
server/tracer/pom.xml | 2 +-
server/tserver/pom.xml | 2 +-
.../server/GarbageCollectionLogger.java | 116 --
.../apache/accumulo/tserver/FileManager.java | 2 +-
.../accumulo/tserver/log/LocalWALRecovery.java | 75 +-
.../accumulo/tserver/tablet/RootFilesTest.java | 7 +-
shell/pom.xml | 2 +-
.../shell/commands/FormatterCommandTest.java | 2 +-
start/pom.xml | 2 +-
.../start/classloader/AccumuloClassLoader.java | 7 +-
.../classloader/vfs/UniqueFileReplicator.java | 3 +-
test/pom.xml | 2 +-
.../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/harness/AccumuloClusterIT.java | 3 +-
.../StandaloneAccumuloClusterConfiguration.java | 11 +-
.../apache/accumulo/proxy/SimpleProxyBase.java | 1268 +++++++++++-------
.../apache/accumulo/proxy/TBinaryProxyIT.java | 12 +-
.../apache/accumulo/proxy/TCompactProxyIT.java | 11 +-
.../accumulo/proxy/TJsonProtocolProxyIT.java | 12 +-
.../apache/accumulo/proxy/TTupleProxyIT.java | 12 +-
.../apache/accumulo/test/AuditMessageIT.java | 5 +-
.../apache/accumulo/test/ImportExportIT.java | 18 +-
.../accumulo/test/functional/CleanTmpIT.java | 12 +-
.../accumulo/test/functional/ConstraintIT.java | 24 +-
.../accumulo/test/functional/DurabilityIT.java | 44 +-
.../test/replication/ReplicationIT.java | 144 +-
trace/pom.xml | 2 +-
78 files changed, 2849 insertions(+), 952 deletions(-)
----------------------------------------------------------------------