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.0
Date Tue, 29 Jul 2014 16:31:34 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
	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/65a4f5dc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65a4f5dc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65a4f5dc

Branch: refs/heads/cassandra-2.1
Commit: 65a4f5dc728f2785256ab1a94e9428a662eff145
Parents: ee62ae1 a5cc16d
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Tue Jul 29 19:27:33 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Tue Jul 29 19:27:33 2014 +0300

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

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



Mime
View raw message