cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Tue, 03 Jun 2014 16:06:34 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/CounterMutation.java
	src/java/org/apache/cassandra/service/StorageProxy.java


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

Branch: refs/heads/trunk
Commit: 4ab20ba97f488a428e2c362ca22cefa44cbf2254
Parents: 9de8d3e e8aaffa
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Tue Jun 3 19:05:54 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Tue Jun 3 19:05:54 2014 +0300

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

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



Mime
View raw message