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 17:20:17 UTC

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

Merge branch 'cassandra-2.0' into cassandra-2.1.0

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/29a99348
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29a99348
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29a99348

Branch: refs/heads/cassandra-2.1.0
Commit: 29a9934858732199efc1f4209b312778b15fd19a
Parents: f3961a6 4c95d08
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Jul 2 17:20:07 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Jul 2 17:20:07 2014 +0200

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

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