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/87248347 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87248347 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87248347 Branch: refs/heads/trunk Commit: 87248347bf4ea52431f43be876bac4638ec7b004 Parents: f56f08c b251e7a Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Feb 4 10:45:30 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Feb 4 10:45:30 2013 +0100 ---------------------------------------------------------------------- NEWS.txt | 5 +++- doc/cql3/CQL.textile | 3 +- src/java/org/apache/cassandra/cql3/Term.java | 22 +++++++++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
