cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Date Tue, 17 Sep 2013 21:58:12 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/494ba458
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/494ba458
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/494ba458

Branch: refs/heads/trunk
Commit: 494ba4582b9be1a391f9bcd7ac0924c3d0dcb76e
Parents: 3700e01 1e0d951
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Sep 17 16:57:59 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Sep 17 16:57:59 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 conf/cassandra.yaml                             |   4 +
 .../org/apache/cassandra/config/Config.java     |   6 +-
 .../cassandra/config/DatabaseDescriptor.java    |   8 ++
 .../cassandra/io/util/PoolingSegmentedFile.java |  14 +-
 .../cassandra/io/util/RandomAccessReader.java   |   5 +
 .../cassandra/metrics/FileCacheMetrics.java     |  64 +++++++++
 .../cassandra/service/FileCacheService.java     | 139 +++++++++++++++++++
 8 files changed, 231 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/494ba458/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------


Mime
View raw message