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

Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/07/02 10:39:38 UTC

[4/7] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 3e807b659b2fc3e0ebab3e261baca12a7fbfb29e
Parents: 39925d2 3425200
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Jul 2 10:29:54 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Jul 2 10:29:54 2014 +0200

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

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