cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/7] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1
Date Tue, 28 Feb 2012 18:03:12 GMT
Merge branch 'cassandra-1.1.0' into cassandra-1.1

Conflicts:
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java


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

Branch: refs/heads/trunk
Commit: 2cc612ca037fedb0a3d03660ac4ba76be9105703
Parents: f6ba989 4fcb56f
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Feb 28 18:58:37 2012 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Feb 28 18:58:37 2012 +0100

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../cassandra/cache/ConcurrentLinkedHashCache.java |   10 ++
 .../cache/ConcurrentLinkedHashCacheProvider.java   |   13 +-
 src/java/org/apache/cassandra/cache/ICache.java    |    4 +
 .../org/apache/cassandra/cache/IRowCacheEntry.java |    5 +
 .../apache/cassandra/cache/IRowCacheProvider.java  |    2 +-
 .../apache/cassandra/cache/InstrumentingCache.java |   10 ++
 .../apache/cassandra/cache/RowCacheSentinel.java   |   45 ++++++
 .../apache/cassandra/cache/SerializingCache.java   |   35 ++++-
 .../cassandra/cache/SerializingCacheProvider.java  |   47 ++++++-
 src/java/org/apache/cassandra/db/ColumnFamily.java |    9 +-
 .../org/apache/cassandra/db/ColumnFamilyStore.java |  120 +++++++++++----
 .../apache/cassandra/db/HintedHandOffManager.java  |    2 +-
 .../apache/cassandra/db/RowIteratorFactory.java    |    2 +
 .../db/compaction/CompactionIterable.java          |    2 +-
 .../db/compaction/ParallelCompactionIterable.java  |    2 +-
 .../org/apache/cassandra/service/CacheService.java |    8 +-
 .../cassandra/streaming/IncomingStreamReader.java  |    3 +-
 .../org/apache/cassandra/utils/StatusLogger.java   |    3 +-
 .../unit/org/apache/cassandra/db/RowCacheTest.java |    4 +-
 20 files changed, 265 insertions(+), 62 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cc612ca/CHANGES.txt
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cc612ca/src/java/org/apache/cassandra/db/RowIteratorFactory.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cc612ca/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cc612ca/src/java/org/apache/cassandra/service/CacheService.java
----------------------------------------------------------------------


Mime
View raw message