accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [21/21] accumulo git commit: Merge branch '1.7'
Date Wed, 20 May 2015 16:25:05 GMT
Merge branch '1.7'


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

Branch: refs/heads/master
Commit: a9d1ad4a7d470071e59382dfad0e10d49c9ee464
Parents: e22103c 1faee53
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Wed May 20 12:09:26 2015 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed May 20 12:09:26 2015 -0400

----------------------------------------------------------------------
 CHANGES                                         |  1 +
 assemble/bin/config.sh                          |  6 +-
 assemble/bin/start-server.sh                    |  4 +-
 .../core/client/impl/ConditionalWriterImpl.java |  2 +-
 .../accumulo/core/file/rfile/bcfile/Utils.java  |  2 +-
 .../iterators/user/IntersectingIterator.java    | 19 ++---
 .../mapred/AccumuloFileOutputFormatTest.java    |  2 +
 .../mapreduce/AccumuloFileOutputFormatTest.java |  2 +
 .../accumulo/examples/simple/shard/Index.java   |  7 +-
 .../impl/MiniAccumuloClusterImpl.java           | 17 ++--
 .../impl/MiniAccumuloConfigImpl.java            |  8 +-
 pom.xml                                         |  8 +-
 .../accumulo/server/util/SendLogToChainsaw.java |  2 +-
 .../org/apache/accumulo/monitor/util/Table.java |  2 +-
 .../monitor/util/celltypes/NumberType.java      |  2 +-
 .../accumulo/tserver/log/LocalWALRecovery.java  | 75 ++++++++---------
 .../accumulo/tserver/tablet/RootFilesTest.java  |  7 +-
 .../shell/commands/FormatterCommandTest.java    |  2 +-
 .../start/classloader/AccumuloClassLoader.java  |  7 +-
 .../classloader/vfs/UniqueFileReplicator.java   |  3 +-
 .../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/CopyTool.java    |  6 +-
 .../apache/accumulo/test/AuditMessageIT.java    |  5 +-
 26 files changed, 168 insertions(+), 127 deletions(-)
----------------------------------------------------------------------


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


Mime
View raw message