cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Date Wed, 07 Jan 2015 23:13:13 GMT
Merge branch 'cassandra-2.1' 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/66348bbe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66348bbe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66348bbe

Branch: refs/heads/trunk
Commit: 66348bbe5914581d53e0e76f7c64237d5a625615
Parents: 2b7522f 6afab52
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Wed Jan 7 17:13:03 2015 -0600
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Wed Jan 7 17:13:03 2015 -0600

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

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



Mime
View raw message