accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [18/18] git commit: Merge branch '1.6.0-SNAPSHOT'
Date Wed, 20 Nov 2013 23:33:37 GMT
Merge branch '1.6.0-SNAPSHOT'

Conflicts:
	core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
	core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
	core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
	core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
	core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
	minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
	minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
	server/base/src/main/java/org/apache/accumulo/server/util/TServerUtils.java
	test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java
	test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java


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

Branch: refs/heads/master
Commit: 31a4356e5126ae843d209fca3700fbea1a9da59a
Parents: 7038755 211ca03
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Wed Nov 20 18:32:33 2013 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed Nov 20 18:32:33 2013 -0500

----------------------------------------------------------------------
 bin/accumulo                                    |  24 +-
 .../1GB/native-standalone/accumulo-env.sh       |   6 +
 conf/examples/1GB/standalone/accumulo-env.sh    |   6 +
 .../2GB/native-standalone/accumulo-env.sh       |   6 +
 conf/examples/2GB/standalone/accumulo-env.sh    |   6 +
 .../3GB/native-standalone/accumulo-env.sh       |   6 +
 conf/examples/3GB/standalone/accumulo-env.sh    |   6 +
 .../512MB/native-standalone/accumulo-env.sh     |   6 +
 conf/examples/512MB/standalone/accumulo-env.sh  |   6 +
 .../accumulo/core/client/ConditionalWriter.java |   3 +
 .../core/client/impl/ConditionalWriterImpl.java |   3 +
 .../client/mapred/AccumuloOutputFormat.java     |   6 +-
 .../client/mapred/AccumuloRowInputFormat.java   |  10 +-
 .../AccumuloMultiTableInputFormat.java          |   9 +-
 .../client/mapreduce/AccumuloOutputFormat.java  |   8 +-
 .../mapreduce/AccumuloRowInputFormat.java       |   6 +-
 .../mapreduce/lib/util/ConfiguratorBase.java    |   8 +-
 .../apache/accumulo/core/data/Condition.java    |  54 ++
 .../accumulo/core/data/ConditionalMutation.java |  31 +-
 .../accumulo_user_manual/chapters/clients.tex   |  27 +-
 .../examples/simple/reservations/ARS.java       | 308 +++++++++
 .../minicluster/MiniAccumuloCluster.java        |  29 +-
 .../minicluster/MiniAccumuloConfig.java         |  33 +-
 .../org/apache/accumulo/proxy/ProxyServer.java  |   7 +-
 .../accumulo/server/util/TServerUtils.java      |   4 -
 .../resources/docs/examples/README.reservations |  66 ++
 server/native/src/main/resources/Makefile       |   2 +-
 .../apache/accumulo/tserver/InMemoryMap.java    |   2 +-
 .../org/apache/accumulo/tserver/NativeMap.java  | 411 +++++++-----
 .../tserver/TabletServerResourceManager.java    |   2 +-
 .../org/apache/accumulo/start/Platform.java     |  27 -
 test/pom.xml                                    |   5 +
 .../accumulo/test/functional/NativeMapTest.java | 654 -------------------
 .../test/randomwalk/conditional/Init.java       |  14 +-
 .../accumulo/test/ConditionalWriterIT.java      |  26 +-
 .../test/MultiTableBatchWriterTest.java         |  18 +-
 .../org/apache/accumulo/test/ShellServerIT.java |  17 +-
 .../test/functional/ConfigurableMacIT.java      |   3 +
 .../accumulo/test/functional/NativeMapIT.java   | 590 ++++++++++++++++-
 39 files changed, 1481 insertions(+), 974 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/31a4356e/test/pom.xml
----------------------------------------------------------------------


Mime
View raw message