You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2014/07/31 07:50:02 UTC
[4/7] git commit: Merge branch 'cassandra-2.1' into trunk
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/45968e56
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45968e56
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45968e56
Branch: refs/heads/trunk
Commit: 45968e56713f09e24608c537c011414807cfac99
Parents: da3fd5d 3da7d9e
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Jul 31 07:41:58 2014 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Jul 31 07:41:58 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/ColumnFamily.java | 3 ++-
.../org/apache/cassandra/db/compaction/LazilyCompactedRow.java | 3 ++-
src/java/org/apache/cassandra/io/sstable/SSTableWriter.java | 2 ++
4 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/45968e56/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/45968e56/src/java/org/apache/cassandra/db/ColumnFamily.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/45968e56/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
----------------------------------------------------------------------