Merge branch cassandra-3.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/04e5ec34 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04e5ec34 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04e5ec34 Branch: refs/heads/trunk Commit: 04e5ec34da4eaa8dc1ca811e667d8b72f3e87a72 Parents: 44f1ee3 90661a3 Author: blerer <benjamin.le...@datastax.com> Authored: Thu Sep 17 22:19:44 2015 +0200 Committer: blerer <benjamin.le...@datastax.com> Committed: Thu Sep 17 22:20:03 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(-) ----------------------------------------------------------------------
