accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [6/6] git commit: Merge branch '1.6.0-SNAPSHOT'
Date Thu, 12 Dec 2013 00:28:11 GMT
Merge branch '1.6.0-SNAPSHOT'


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

Branch: refs/heads/master
Commit: 62e4375a6b6a3d8ba4b3c339f27eba7f91b69986
Parents: f84e9a1 c1fbeac
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Wed Dec 11 19:27:51 2013 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed Dec 11 19:27:51 2013 -0500

----------------------------------------------------------------------
 .../org/apache/accumulo/core/conf/Property.java |  11 +-
 .../apache/accumulo/core/data/KeyExtent.java    | 276 ++++-----
 .../accumulo/core/util/ArgumentChecker.java     |  18 +-
 .../client/mapred/AccumuloInputFormatTest.java  |  31 +-
 .../core/client/mock/MockNamespacesTest.java    |   3 +-
 .../core/file/BloomFilterLayerLookupTest.java   | 121 ++--
 .../simple/client/RandomBatchWriter.java        |  48 +-
 .../simple/filedata/CharacterHistogram.java     |  28 +-
 .../examples/simple/mapreduce/NGramIngest.java  |  36 +-
 .../examples/simple/mapreduce/RegexExample.java |  24 +-
 .../examples/simple/mapreduce/RowHash.java      |  22 +-
 .../examples/simple/mapreduce/TableToFile.java  |  28 +-
 .../simple/mapreduce/TeraSortIngest.java        |  97 ++--
 .../simple/mapreduce/TokenFileWordCount.java    |  33 +-
 .../simple/mapreduce/UniqueColumns.java         |  44 +-
 .../examples/simple/mapreduce/WordCount.java    |  29 +-
 .../mapreduce/bulk/BulkIngestExample.java       |  51 +-
 .../simple/mapreduce/bulk/GenerateTestData.java |  20 +-
 .../simple/filedata/ChunkInputFormatTest.java   |  86 +--
 .../minicluster/MiniAccumuloCluster.java        |  26 +-
 .../security/AuditedSecurityOperation.java      | 120 ++--
 .../tserver/log/TestUpgradePathForWALogs.java   |  44 +-
 .../accumulo/test/MultiTableBatchWriterIT.java  | 505 +++++++++++++++++
 .../test/MultiTableBatchWriterTest.java         | 565 -------------------
 .../org/apache/accumulo/test/ShellServerIT.java |   5 +-
 .../test/functional/ConfigurableMacIT.java      |   2 +-
 .../accumulo/test/functional/ExamplesIT.java    | 112 ++--
 .../test/functional/FunctionalTestUtils.java    |  45 +-
 .../accumulo/test/functional/MapReduceIT.java   |   7 +-
 .../accumulo/test/functional/SimpleMacIT.java   |   3 +
 .../accumulo/test/functional/ZooCacheIT.java    |  16 +-
 .../accumulo/test/util/CertUtilsTest.java       |   2 +-
 .../randomwalk/conf/modules/Concurrent.xml      |   5 -
 33 files changed, 1214 insertions(+), 1249 deletions(-)
----------------------------------------------------------------------



Mime
View raw message