cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Tue, 25 Mar 2014 19:03:42 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

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


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

Branch: refs/heads/trunk
Commit: 48847b5c0ebb9b699ca11a793d8d675e9f2464f4
Parents: 0cd1769 58e524e
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Tue Mar 25 22:02:37 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Tue Mar 25 22:02:37 2014 +0300

----------------------------------------------------------------------
 .../db/compaction/AbstractCompactionStrategy.java         | 10 ++++++++++
 1 file changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/48847b5c/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
----------------------------------------------------------------------


Mime
View raw message