cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Date Thu, 19 Sep 2013 10:58:50 GMT
Merge branch 'cassandra-2.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63589bac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63589bac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63589bac

Branch: refs/heads/trunk
Commit: 63589bac5aa70f5833ef2c821f47fc3b7739613c
Parents: 54f41a9 37e9bce
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Thu Sep 19 12:58:40 2013 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Thu Sep 19 12:58:40 2013 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 doc/cql3/CQL.textile                            |  6 ++-
 doc/native_protocol_v2.spec                     | 20 +++++---
 .../apache/cassandra/cql3/AbstractMarker.java   |  4 +-
 .../org/apache/cassandra/cql3/Attributes.java   |  2 +-
 src/java/org/apache/cassandra/cql3/Cql.g        | 31 +++++++++---
 src/java/org/apache/cassandra/cql3/Lists.java   |  4 +-
 src/java/org/apache/cassandra/cql3/Maps.java    |  4 +-
 .../org/apache/cassandra/cql3/Operation.java    |  2 +-
 src/java/org/apache/cassandra/cql3/Sets.java    |  2 +-
 src/java/org/apache/cassandra/cql3/Term.java    |  6 +--
 .../cassandra/cql3/VariableSpecifications.java  | 52 ++++++++++++++++++++
 .../cassandra/cql3/functions/FunctionCall.java  |  9 +---
 .../cql3/statements/BatchStatement.java         |  4 +-
 .../cql3/statements/CreateTableStatement.java   |  1 -
 .../cql3/statements/DeleteStatement.java        |  4 +-
 .../cql3/statements/ModificationStatement.java  | 10 ++--
 .../cql3/statements/ParsedStatement.java        | 15 ++++--
 .../statements/SchemaAlteringStatement.java     |  5 ++
 .../cql3/statements/SelectStatement.java        |  8 +--
 .../cql3/statements/TruncateStatement.java      |  5 ++
 .../cql3/statements/UpdateStatement.java        |  8 +--
 .../cassandra/cql3/statements/UseStatement.java |  5 ++
 23 files changed, 150 insertions(+), 58 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/63589bac/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/63589bac/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------


Mime
View raw message