cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [9/9] git commit: Merge branch 'cassandra-2.1' into trunk
Date Fri, 28 Feb 2014 16:08:47 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/3c186bef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c186bef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3c186bef

Branch: refs/heads/trunk
Commit: 3c186bef82e61331951b79df4cce05c0a0f11ebb
Parents: b23d6ba b41eb4a
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Feb 28 10:08:36 2014 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Feb 28 10:08:36 2014 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                 | 1 +
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java     | 9 +++++----
 .../org/apache/cassandra/db/compaction/CompactionTask.java  | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


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


Mime
View raw message