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/d17c6f2a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d17c6f2a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d17c6f2a
Branch: refs/heads/trunk
Commit: d17c6f2afe60d80dbc2467330c6f1bb1c1bca15c
Parents: 2f3b8d4 f8b939a
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Nov 16 12:38:34 2012 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Nov 16 12:38:34 2012 +0100
----------------------------------------------------------------------
NEWS.txt | 3 +++
doc/cql3/CQL.textile | 6 +-----
src/java/org/apache/cassandra/cql3/Cql.g | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
|