cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Date Mon, 01 Sep 2014 13:51:10 GMT
Merge branch 'cassandra-2.1.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 40182323f5b052cca3e8d2bea6b808a6f85c1241
Parents: bff7572 ef89045
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Mon Sep 1 15:46:48 2014 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Mon Sep 1 15:46:48 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                             |  1 +
 src/java/org/apache/cassandra/db/DataTracker.java       | 12 ++++++++++++
 .../apache/cassandra/db/compaction/LeveledManifest.java |  5 ++++-
 .../org/apache/cassandra/io/sstable/SSTableReader.java  |  5 +++++
 4 files changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


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

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


Mime
View raw message