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

Posted to commits@cassandra.apache.org by al...@apache.org on 2014/04/25 16:04:24 UTC

[3/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/cql3/CFDefinition.java


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

Branch: refs/heads/trunk
Commit: e9f180ca97806ef897bfad9753effd6c64e6a8b6
Parents: a4f5794 98dcde1
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Apr 25 15:42:55 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Apr 25 15:42:55 2014 +0200

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

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