Updated Branches: refs/heads/cassandra-1.1 11d141462 -> 9c8d94930 refs/heads/cassandra-1.2 9719b6874 -> ba6cd11b7 refs/heads/trunk aad2fdd31 -> 47e789187
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/47e78918 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47e78918 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/47e78918 Branch: refs/heads/trunk Commit: 47e789187044ba26cbaf7b0c72240efdc9ea36b8 Parents: aad2fdd ba6cd11 Author: Jonathan Ellis <[email protected]> Authored: Thu Jan 24 08:57:55 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Thu Jan 24 08:57:55 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/LazilyCompactedRow.java | 2 +- .../cassandra/io/sstable/SSTableMetadata.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/47e78918/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/47e78918/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java ----------------------------------------------------------------------
