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/0cc554e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cc554e9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cc554e9 Branch: refs/heads/cassandra-1.2 Commit: 0cc554e93b749992580d1e037b542fa9195105de Parents: 2f3b8d4 8dd1d56 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Nov 16 16:36:14 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Nov 16 16:36:14 2012 -0600 ---------------------------------------------------------------------- NEWS.txt | 3 +++ doc/cql3/CQL.textile | 6 +----- .../cli/transport/FramedTransportFactory.java | 5 ++++- src/java/org/apache/cassandra/cql3/Cql.g | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
