Updated Branches: refs/heads/cassandra-1.2 707da4e82 -> ead90d2ca
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ead90d2c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ead90d2c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ead90d2c Branch: refs/heads/cassandra-1.2 Commit: ead90d2ca878b03cded6ebdd20153978b4393a8d Parents: 707da4e 83bbd75 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Nov 19 17:55:14 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Nov 19 17:55:14 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Cql.g | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ead90d2c/CHANGES.txt ----------------------------------------------------------------------
