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/ccbf9219 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ccbf9219 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ccbf9219 Branch: refs/heads/trunk Commit: ccbf92198f5f7338fcaa2f1aa7e5ff0488b63600 Parents: dfa7c58 b1c60a0 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Oct 15 02:37:58 2013 +0700 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Oct 15 02:37:58 2013 +0700 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql/AbstractModification.java | 5 +++++ src/java/org/apache/cassandra/cql/BatchStatement.java | 5 +++++ src/java/org/apache/cassandra/cql/SelectStatement.java | 5 +++++ src/java/org/apache/cassandra/cql/WhereClause.java | 5 +++++ .../org/apache/cassandra/cql3/statements/BatchStatement.java | 5 +++++ .../org/apache/cassandra/cql3/statements/DeleteStatement.java | 2 +- .../apache/cassandra/cql3/statements/ModificationStatement.java | 4 ++-- .../org/apache/cassandra/cql3/statements/SelectStatement.java | 2 +- .../org/apache/cassandra/cql3/statements/UpdateStatement.java | 2 +- 9 files changed, 30 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ccbf9219/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ----------------------------------------------------------------------
