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 23:18:32 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

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

Branch: refs/heads/trunk
Commit: a5a726174ab3b574544950ba3cd75186461b797f
Parents: bef9526 6874aaa
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Sat Mar 29 02:17:56 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Sat Mar 29 02:17:56 2014 +0300

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

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



Mime
View raw message