Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51908e24 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51908e24 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51908e24 Branch: refs/heads/trunk Commit: 51908e240c97ac6fa228950fbdea2eb790345525 Parents: 23c84b1 9449a70 Author: Yuki Morishita <[email protected]> Authored: Fri Apr 3 09:19:51 2015 -0500 Committer: Yuki Morishita <[email protected]> Committed: Fri Apr 3 09:19:51 2015 -0500 ---------------------------------------------------------------------- .../cassandra/db/compaction/LazilyCompactedRow.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/51908e24/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java ----------------------------------------------------------------------
