cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Fri, 02 May 2014 09:30:57 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/ColumnGroupMap.java
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java


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

Branch: refs/heads/cassandra-2.1
Commit: a811dd0e9a51b72d166d892e9940fa9c258b9da6
Parents: 18d3b52 2e9ac19
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri May 2 11:30:48 2014 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri May 2 11:30:48 2014 +0200

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

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



Mime
View raw message