cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Date Wed, 14 Aug 2013 06:46:18 GMT
Merge branch 'cassandra-2.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/a69457c1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a69457c1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a69457c1

Branch: refs/heads/trunk
Commit: a69457c14a36c5eb3db523b3eb42b6d399993177
Parents: c651f83 9e846d9
Author: Marcus Eriksson <marcuse@spotify.com>
Authored: Wed Aug 14 08:45:34 2013 +0200
Committer: Marcus Eriksson <marcuse@spotify.com>
Committed: Wed Aug 14 08:45:34 2013 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |   2 +-
 .../apache/cassandra/db/ColumnFamilyStore.java  |  12 +
 .../db/compaction/CompactionManager.java        | 178 ++++++++----
 .../cassandra/io/sstable/SSTableReader.java     |  18 +-
 .../cassandra/io/sstable/SSTableScanner.java    | 150 ++++++----
 .../org/apache/cassandra/db/RowCacheTest.java   |  37 ++-
 .../io/sstable/SSTableScannerTest.java          | 287 +++++++++++++++++++
 7 files changed, 563 insertions(+), 121 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a69457c1/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------


Mime
View raw message