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/956fa776 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/956fa776 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/956fa776 Branch: refs/heads/trunk Commit: 956fa77689f44a4a4f7c2b57ba1eb38e06eb7527 Parents: f563076 d6ccfb5 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Dec 10 09:47:18 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Dec 10 09:47:18 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Cql.g | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/956fa776/CHANGES.txt ----------------------------------------------------------------------
