Updated Branches: refs/heads/trunk eb1e1b0d4 -> ea4f28505
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea4f2850 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea4f2850 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea4f2850 Branch: refs/heads/trunk Commit: ea4f2850570c3fbbd3be5e87e954702287d6d4a2 Parents: eb1e1b0 956fa77 Author: Sylvain Lebresne <[email protected]> Authored: Mon Dec 10 09:47:52 2012 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Dec 10 09:47:52 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/ea4f2850/CHANGES.txt ----------------------------------------------------------------------
