natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.0' into cassandra-2.1.0 

Conflicts:
	CHANGES.txt
This commit is contained in:
Tyler Hobbs 2014-07-22 12:04:34 -05:00
parent df7bd7f725 9906a4e5de
commit e740c29795
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/cql/CQL.textile
View File

@ -2,6 +2,8 @@
h1. Cassandra Query Language (CQL) v2.0
<b>%{color:red}NOTICE%</b>: CQL 2 has been deprecated since Cassandra 2.0, and will be removed in Cassandra 3.0. It is recommended that you upgrade to CQL 3, which has much better driver support and many new features. For further reading, see the "CQL 3 documentation":http://cassandra.apache.org/doc/cql3/CQL.html and the "CQL 3 drivers":http://wiki.apache.org/cassandra/ClientOptions.
h2. Table of Contents
{toc}