cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [7/7] git commit: Merge branch 'cassandra-2.1' into trunk
Date Thu, 31 Jul 2014 05:50:05 GMT
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/a88c7e10
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a88c7e10
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a88c7e10

Branch: refs/heads/trunk
Commit: a88c7e10f360c599d39fafa01d9dcc85f6f41cf0
Parents: 45968e5 40d7bdf
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Thu Jul 31 07:47:47 2014 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Thu Jul 31 07:47:47 2014 +0200

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/ColumnFamily.java               | 4 ++--
 .../org/apache/cassandra/db/compaction/LazilyCompactedRow.java   | 4 ++--
 src/java/org/apache/cassandra/io/sstable/SSTableWriter.java      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a88c7e10/src/java/org/apache/cassandra/db/ColumnFamily.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a88c7e10/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
----------------------------------------------------------------------


Mime
View raw message