cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Wed, 18 Jun 2014 01:01:32 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

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

Branch: refs/heads/cassandra-2.1
Commit: d38f677c007a46f6fa914e7a3535bb12feb6ec94
Parents: 5e90091 9afc209
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Tue Jun 17 18:01:23 2014 -0700
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Tue Jun 17 18:01:23 2014 -0700

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

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



Mime
View raw message