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 Fri, 28 Mar 2014 21:44:39 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
	src/java/org/apache/cassandra/db/DataTracker.java
	src/java/org/apache/cassandra/db/Memtable.java


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

Branch: refs/heads/trunk
Commit: 1e57bd1553e463c0440eab7bdedf860eecf04398
Parents: 6e6863d 47bbfe3
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Sat Mar 29 00:43:37 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Sat Mar 29 00:43:37 2014 +0300

----------------------------------------------------------------------

----------------------------------------------------------------------



Mime
View raw message