Updated Branches: refs/heads/trunk b4d94c0e7 -> 9118804b5
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9118804b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9118804b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9118804b Branch: refs/heads/trunk Commit: 9118804b536a0d45c26be2bd683e61360292f780 Parents: b4d94c0 5177d56 Author: Sylvain Lebresne <[email protected]> Authored: Tue May 29 21:59:11 2012 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Tue May 29 21:59:11 2012 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/CFPropDefs.java | 2 +- src/java/org/apache/cassandra/cql3/Cql.g | 8 ++------ 3 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9118804b/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9118804b/src/java/org/apache/cassandra/cql3/CFPropDefs.java ----------------------------------------------------------------------
