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-1.2' into trunk
Date Mon, 08 Apr 2013 09:41:28 GMT
Merge branch 'cassandra-1.2' into trunk

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

Branch: refs/heads/trunk
Commit: 23d15ee4e03151ff9fef3acae06fc391a42894be
Parents: bc6b5f4 69f05a7
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Mon Apr 8 11:41:20 2013 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Mon Apr 8 11:41:20 2013 +0200

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

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



Mime
View raw message