Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2fc450a0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2fc450a0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2fc450a0 Branch: refs/heads/trunk Commit: 2fc450a0bf85fb3caaa1b81274f40552a7b59ba4 Parents: 62f4293 c48c7ef Author: Yuki Morishita <[email protected]> Authored: Wed May 22 14:08:31 2013 -0500 Committer: Yuki Morishita <[email protected]> Committed: Wed May 22 14:08:31 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/DeletedColumn.java | 21 +++++++++++++++ .../org/apache/cassandra/db/RangeTombstone.java | 1 - 3 files changed, 22 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fc450a0/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fc450a0/src/java/org/apache/cassandra/db/DeletedColumn.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fc450a0/src/java/org/apache/cassandra/db/RangeTombstone.java ----------------------------------------------------------------------
