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

Posted to commits@cassandra.apache.org by ja...@apache.org on 2014/05/07 20:39:25 UTC

[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.1

Merge branch 'cassandra-1.2' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/streaming/AbstractStreamSession.java


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

Branch: refs/heads/cassandra-2.1
Commit: 411abc78e11a80518179f56eca1a22786541e1a6
Parents: 0ca4942 21b3a67
Author: Jake Luciani <ja...@apache.org>
Authored: Wed May 7 14:27:09 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Wed May 7 14:27:09 2014 -0400

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

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