accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [05/11] accumulo git commit: Merge branch '1.7'
Date Thu, 23 Apr 2015 14:32:51 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/fd9bb3a7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fd9bb3a7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fd9bb3a7

Branch: refs/heads/1.7
Commit: fd9bb3a794c84c40c875e33c4d96092563c19833
Parents: 33ef1e0 ac08cc4
Author: Keith Turner <kturner@apache.org>
Authored: Wed Apr 22 12:15:49 2015 -0400
Committer: Keith Turner <kturner@apache.org>
Committed: Wed Apr 22 12:15:49 2015 -0400

----------------------------------------------------------------------
 .../core/client/MutationsRejectedException.java |  24 ++---
 .../core/client/admin/ActiveCompaction.java     |   4 +-
 .../accumulo/core/client/admin/ActiveScan.java  |   4 +-
 .../core/client/impl/ActiveCompactionImpl.java  |   8 +-
 .../core/client/impl/ActiveScanImpl.java        |   8 +-
 .../client/impl/TabletServerBatchWriter.java    |   8 +-
 .../client/mapred/AccumuloOutputFormat.java     |   4 +-
 .../client/mapreduce/AccumuloOutputFormat.java  |   4 +-
 .../apache/accumulo/core/data/KeyExtent.java    |   2 +-
 .../org/apache/accumulo/core/data/TabletID.java |  29 ------
 .../org/apache/accumulo/core/data/TabletId.java |  31 ++++++
 .../accumulo/core/data/impl/TabletIDImpl.java   | 100 -------------------
 .../accumulo/core/data/impl/TabletIdImpl.java   | 100 +++++++++++++++++++
 .../simple/client/RandomBatchWriter.java        |   4 +-
 .../org/apache/accumulo/proxy/ProxyServer.java  |   6 +-
 .../accumulo/shell/commands/InsertCommand.java  |   4 +-
 .../org/apache/accumulo/test/TestIngest.java    |   4 +-
 17 files changed, 173 insertions(+), 171 deletions(-)
----------------------------------------------------------------------



Mime
View raw message