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 2015/05/19 18:49:47 UTC
[1/2] cassandra git commit: Change 3.0 => 2.2 in CQL3 documentation
Repository: cassandra
Updated Branches:
refs/heads/trunk a53a6ceda -> a78f5e863
Change 3.0 => 2.2 in CQL3 documentation
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d085ebb4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d085ebb4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d085ebb4
Branch: refs/heads/trunk
Commit: d085ebb4cbd3b9470c8236b167ff3d11e6765fb0
Parents: e8766e5
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue May 19 11:48:58 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue May 19 11:48:58 2015 -0500
----------------------------------------------------------------------
doc/cql3/CQL.textile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d085ebb4/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index 2e58615..2463a01 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -1498,7 +1498,7 @@ See "@CREATE AGGREGATE@":#createAggregateStmt and "@DROP AGGREGATE@":#dropAggreg
h2(#json). JSON Support
-Cassandra 3.0 introduces JSON support to "@SELECT@":#selectStmt and "@INSERT@":#insertStmt statements. This support does not fundamentally alter the CQL API (for example, the schema is still enforced), it simply provides a convenient way to work with JSON documents.
+Cassandra 2.2 introduces JSON support to "@SELECT@":#selectStmt and "@INSERT@":#insertStmt statements. This support does not fundamentally alter the CQL API (for example, the schema is still enforced), it simply provides a convenient way to work with JSON documents.
h3(#selectJson). SELECT JSON
[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a78f5e86
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a78f5e86
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a78f5e86
Branch: refs/heads/trunk
Commit: a78f5e8634216d061806fe17a6de75a38f15aac2
Parents: a53a6ce d085ebb
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue May 19 11:49:36 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue May 19 11:49:36 2015 -0500
----------------------------------------------------------------------
doc/cql3/CQL.textile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------