Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/296d11b9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/296d11b9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/296d11b9 Branch: refs/heads/trunk Commit: 296d11b985a7c15cedf8d95ca85a596db48dc470 Parents: 32b8287 bcfb652 Author: Tyler Hobbs <[email protected]> Authored: Wed Feb 4 11:27:17 2015 -0600 Committer: Tyler Hobbs <[email protected]> Committed: Wed Feb 4 11:27:17 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/cql3handling.py | 2 +- pylib/cqlshlib/helptopics.py | 3 ++- src/java/org/apache/cassandra/cql3/Cql.g | 6 ++++-- .../apache/cassandra/cql3/statements/UpdateStatement.java | 8 +++++--- 5 files changed, 13 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/296d11b9/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/296d11b9/pylib/cqlshlib/cql3handling.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/296d11b9/pylib/cqlshlib/helptopics.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/296d11b9/src/java/org/apache/cassandra/cql3/Cql.g ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/296d11b9/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java ----------------------------------------------------------------------
