cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Fri, 09 Oct 2015 16:07:30 GMT
Merge branch 'cassandra-3.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e8d8941c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8d8941c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8d8941c

Branch: refs/heads/trunk
Commit: e8d8941cc8343312ee1deb7f71ef038572c043cb
Parents: f8358b8 6584331
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Oct 9 18:07:18 2015 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Oct 9 18:07:18 2015 +0200

----------------------------------------------------------------------
 .../org/apache/cassandra/db/ColumnIndex.java    |  10 +-
 src/java/org/apache/cassandra/db/Memtable.java  |   2 +-
 .../cassandra/db/SerializationHeader.java       |  26 ++-
 .../cassandra/db/UnfilteredDeserializer.java    |   8 +-
 .../rows/UnfilteredRowIteratorSerializer.java   |  10 +-
 .../cassandra/db/rows/UnfilteredSerializer.java | 174 +++++++++++--------
 .../io/sstable/AbstractSSTableSimpleWriter.java |   2 +-
 .../io/sstable/SSTableSimpleUnsortedWriter.java |   4 +-
 .../apache/cassandra/db/RowIndexEntryTest.java  |   4 +-
 .../unit/org/apache/cassandra/db/ScrubTest.java |   3 +-
 .../db/compaction/AntiCompactionTest.java       |   2 +-
 .../io/sstable/BigTableWriterTest.java          |   2 +-
 .../io/sstable/SSTableRewriterTest.java         |   4 +-
 .../cassandra/io/sstable/SSTableUtils.java      |   2 +-
 14 files changed, 155 insertions(+), 98 deletions(-)
----------------------------------------------------------------------



Mime
View raw message