You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by mi...@apache.org on 2014/05/02 00:22:30 UTC

[08/13] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

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/trunk
Commit: 4ca1a4d686b1f1beefdf43045f38ec32ff6e8a92
Parents: 26633ca b573d0f
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu May 1 15:21:01 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu May 1 15:21:01 2014 -0700

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

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