cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Tue, 22 Dec 2015 11:28:46 GMT
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/72094a41
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/72094a41
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/72094a41

Branch: refs/heads/trunk
Commit: 72094a41c2732810a83b2f4139b50397337a1871
Parents: 7950d80 4e5867a
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Dec 22 12:28:24 2015 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Dec 22 12:28:24 2015 +0100

----------------------------------------------------------------------
 doc/cql3/CQL.textile                                   | 8 ++++++--
 src/java/org/apache/cassandra/cql3/QueryProcessor.java | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/72094a41/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --cc doc/cql3/CQL.textile
index 33e5dc0,e323768..32cf330
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@@ -1,6 -1,6 +1,6 @@@
  <link rel="StyleSheet" href="CQL.css" type="text/css" media="screen">
  
- h1. Cassandra Query Language (CQL) v3.3.2
 -h1. Cassandra Query Language (CQL) v3.4.0
++h1. Cassandra Query Language (CQL) v3.4.1
  
  
  
@@@ -2299,10 -2267,10 +2299,14 @@@ h2(#changes). Change
  
  The following describes the changes in each version of CQL.
  
- h3. 3.3.2
++h3. 3.4.1
 +
 +* Adds @CAST@ functions. See "@Cast@":#castFun.
 +
+ h3. 3.4.0
+ 
+ * Support for "materialized views":#createMVStmt
+ 
  h3. 3.3.1
  
  * The syntax @TRUNCATE TABLE X@ is now accepted as an alias for @TRUNCATE X@


Mime
View raw message