You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2014/07/22 19:06:22 UTC
[1/3] git commit: Ninja: add note about CQL2 removal to CQL2 docs
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 f9af6ab58 -> e0b88878c
Ninja: add note about CQL2 removal to CQL2 docs
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9906a4e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9906a4e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9906a4e5
Branch: refs/heads/cassandra-2.1
Commit: 9906a4e5de083b3d23d4e2b68c2bf1736405d878
Parents: ff211a4
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Tue Jul 22 11:59:53 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Tue Jul 22 12:00:24 2014 -0500
----------------------------------------------------------------------
doc/cql/CQL.textile | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9906a4e5/doc/cql/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql/CQL.textile b/doc/cql/CQL.textile
index 1cfe883..a874a29 100644
--- a/doc/cql/CQL.textile
+++ b/doc/cql/CQL.textile
@@ -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}
[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e0b88878
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0b88878
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0b88878
Branch: refs/heads/cassandra-2.1
Commit: e0b88878c52b6692d2391b398372d5f5f2a83aff
Parents: f9af6ab e740c29
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Tue Jul 22 12:06:11 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Tue Jul 22 12:06:11 2014 -0500
----------------------------------------------------------------------
doc/cql/CQL.textile | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by ty...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e740c297
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e740c297
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e740c297
Branch: refs/heads/cassandra-2.1
Commit: e740c297951603947f6aa293a8ffa4c372ed3aef
Parents: df7bd7f 9906a4e
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Tue Jul 22 12:04:34 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Tue Jul 22 12:04:34 2014 -0500
----------------------------------------------------------------------
doc/cql/CQL.textile | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e740c297/doc/cql/CQL.textile
----------------------------------------------------------------------