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/03/05 19:55:09 UTC

[1/3] cassandra git commit: Fix link to CREATE KEYSPACE in CQL3 docs

Repository: cassandra
Updated Branches:
  refs/heads/trunk 71778eec2 -> 56e190b1c


Fix link to CREATE KEYSPACE in CQL3 docs

Patch by Jon Åslund; reviewed by Tyler Hobbs


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d04602d3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d04602d3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d04602d3

Branch: refs/heads/trunk
Commit: d04602d3da3793e574e59bed60bd0a2b5b88917b
Parents: 90a012a
Author: Jon Åslund <jo...@aslund.org>
Authored: Thu Mar 5 12:54:01 2015 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Mar 5 12:54:01 2015 -0600

----------------------------------------------------------------------
 doc/cql3/CQL.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d04602d3/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index cf074af..4f66e74 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -194,7 +194,7 @@ ALTER KEYSPACE Excelsior
           WITH replication = {'class': 'SimpleStrategy', 'replication_factor' : 4};
 
 p. 
-The @ALTER KEYSPACE@ statement alter the properties of an existing keyspace. The supported @<properties>@ are the same that for the "@CREATE TABLE@":#createKeyspaceStmt statement.
+The @ALTER KEYSPACE@ statement alters the properties of an existing keyspace. The supported @<properties>@ are the same as for the "@CREATE KEYSPACE@":#createKeyspaceStmt statement.
 
 
 h3(#dropKeyspaceStmt). DROP KEYSPACE


[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56e190b1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56e190b1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56e190b1

Branch: refs/heads/trunk
Commit: 56e190b1cd18ea04dd9835722b599f75f80f30a7
Parents: 71778ee 59ed491
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Thu Mar 5 12:54:58 2015 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Mar 5 12:54:58 2015 -0600

----------------------------------------------------------------------
 doc/cql3/CQL.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/56e190b1/doc/cql3/CQL.textile
----------------------------------------------------------------------


[2/3] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by ty...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/59ed491a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59ed491a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/59ed491a

Branch: refs/heads/trunk
Commit: 59ed491ac8dbc8e7a1dcfa6bf1cc1501f8dec72b
Parents: 9c7a601 d04602d
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Thu Mar 5 12:54:40 2015 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Mar 5 12:54:40 2015 -0600

----------------------------------------------------------------------
 doc/cql3/CQL.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/59ed491a/doc/cql3/CQL.textile
----------------------------------------------------------------------