You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/08/06 21:15:58 UTC

[3/3] git commit: Merge branch 'cassandra-2.0' into trunk

Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 885ba119f8f20a99caa3a66906519e76c3e7688b
Parents: aa581e0 ed4a067
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Aug 6 14:15:59 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Aug 6 14:15:59 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   4 +
 .../cassandra/db/AtomicSortedColumns.java       |  13 +-
 .../org/apache/cassandra/db/DeletionInfo.java   |   5 +
 .../org/apache/cassandra/db/RangeTombstone.java |   6 +-
 .../db/compaction/LazilyCompactedRow.java       |  11 +-
 .../db/compaction/PrecompactedRow.java          |  14 +-
 .../apache/cassandra/db/RangeTombstoneTest.java | 220 ++++++++++++++++++-
 7 files changed, 264 insertions(+), 9 deletions(-)
----------------------------------------------------------------------