Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90661a32 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90661a32 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90661a32 Branch: refs/heads/trunk Commit: 90661a325984b6d27fd979029435ad52ae782aca Parents: 41a4a53 eecfb07 Author: blerer <benjamin.le...@datastax.com> Authored: Thu Sep 17 22:16:47 2015 +0200 Committer: blerer <benjamin.le...@datastax.com> Committed: Thu Sep 17 22:17:40 2015 +0200 ---------------------------------------------------------------------- NEWS.txt | 8 ++++ bin/cqlsh.py | 2 +- doc/cql3/CQL.textile | 10 +++- pylib/cqlshlib/cql3handling.py | 2 +- src/java/org/apache/cassandra/cql3/Cql.g | 2 +- .../apache/cassandra/cql3/QueryProcessor.java | 2 +- .../validation/operations/TruncateTest.java | 48 ++++++++++++++++++++ 7 files changed, 68 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/90661a32/NEWS.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/90661a32/bin/cqlsh.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/90661a32/doc/cql3/CQL.textile ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/90661a32/pylib/cqlshlib/cql3handling.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/90661a32/src/java/org/apache/cassandra/cql3/Cql.g ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/90661a32/src/java/org/apache/cassandra/cql3/QueryProcessor.java ----------------------------------------------------------------------
