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.0
Date Wed, 20 Aug 2014 12:47:50 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1.0

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

Branch: refs/heads/cassandra-2.1.0
Commit: c8a8bfc1e7e89ea27143660c2d738f7fc2ea1a13
Parents: 39b8196 eeb0d4c
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Aug 20 15:47:37 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Aug 20 15:47:37 2014 +0300

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

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



Mime
View raw message