cassandra-commits mailing list archives

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


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

Branch: refs/heads/trunk
Commit: eeb150e9e318460e906ffc1a1d0b485cd00100f8
Parents: 1bc8ffd 4018232
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Mon Sep 1 15:49:43 2014 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Mon Sep 1 15:49:43 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/eeb150e9/CHANGES.txt
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eeb150e9/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------


Mime
View raw message