cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mish...@apache.org
Subject [10/13] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Thu, 01 May 2014 22:22:32 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java


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

Branch: refs/heads/cassandra-2.0
Commit: 4ca1a4d686b1f1beefdf43045f38ec32ff6e8a92
Parents: 26633ca b573d0f
Author: Mikhail Stepura <mishail@apache.org>
Authored: Thu May 1 15:21:01 2014 -0700
Committer: Mikhail Stepura <mishail@apache.org>
Committed: Thu May 1 15:21:01 2014 -0700

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

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



Mime
View raw message