[2/4] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

[bl...@apache.org]

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eecfb07d/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --cc doc/cql3/CQL.textile
index ce712be,cc041df..aa0468b
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@@ -1,6 -1,6 +1,7 @@@
  <link rel="StyleSheet" href="CQL.css" type="text/css" media="screen">
  
- h1. Cassandra Query Language (CQL) v3.3.0
 -h1. Cassandra Query Language (CQL) v3.2.1
++h1. Cassandra Query Language (CQL) v3.3.1
++
  
  
   <span id="tableOfContents">
@@@ -2197,17 -1531,10 +2198,22 @@@ h2(#changes). Change
  
  The following describes the changes in each version of CQL.
  
 -h3. 3.2.1
++
++h3. 3.3.1
+ 
+ * The syntax @TRUNCATE TABLE X@ is now accepted as an alias for @TRUNCATE X@
+ 
 +h3. 3.3.0
 +
 +* Adds new "aggregates":#aggregates
 +* User-defined functions are now supported through "@CREATE FUNCTION@":#createFunctionStmt and "@DROP FUNCTION@":#dropFunctionStmt.
 +* User-defined aggregates are now supported through "@CREATE AGGREGATE@":#createAggregateStmt and "@DROP AGGREGATE@":#dropAggregateStmt.
 +* Allows double-dollar enclosed strings literals as an alternative to single-quote enclosed strings.
 +* Introduces Roles to supercede user based authentication and access control
 +* "@Date@":#usingdates and "@Time@":usingtime data types have been added
 +* "@JSON@":#json support has been added
 +* Adds new time conversion functions and deprecate @dateOf@ and @unixTimestampOf@. See "@Time conversion functions@":#timeFun
 +
  h3. 3.2.0
  
  * User-defined types are now supported through "@CREATE TYPE@":#createTypeStmt, "@ALTER TYPE@":#alterTypeStmt, and "@DROP TYPE@":#dropTypeStmt

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eecfb07d/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eecfb07d/src/java/org/apache/cassandra/cql3/Cql.g
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eecfb07d/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/QueryProcessor.java
index e9ff1b1,d4ca76f..161d8d0
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@@ -56,7 -64,7 +56,7 @@@ import org.github.jamm.MemoryMeter
  
  public class QueryProcessor implements QueryHandler
  {
-     public static final CassandraVersion CQL_VERSION = new CassandraVersion("3.3.0");
 -    public static final SemanticVersion CQL_VERSION = new SemanticVersion("3.2.1");
++    public static final CassandraVersion CQL_VERSION = new CassandraVersion("3.3.1");
  
      public static final QueryProcessor instance = new QueryProcessor();