You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/11/18 17:32:01 UTC
[1/2] git commit: Fix typo
Updated Branches:
refs/heads/cassandra-2.0 25471bac3 -> 4444fd6ff
Fix typo
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ac60198
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ac60198
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ac60198
Branch: refs/heads/cassandra-2.0
Commit: 1ac601980382516419bfe45b01ce1b8eccf4d9ce
Parents: 0ffa5c2
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Nov 18 17:30:55 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Nov 18 17:30:55 2013 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/thrift/CassandraServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ac60198/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 5b9fbfd..883ab5a 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -1407,7 +1407,7 @@ public class CassandraServer implements Cassandra.Iface
if (oldCfm == null)
throw new InvalidRequestException("Could not find column family definition to modify.");
- if (!oldCfm.isThriftIncompatible())
+ if (oldCfm.isThriftIncompatible())
throw new InvalidRequestException("Cannot modify CQL3 table " + oldCfm.cfName + " as it may break the schema. You should use cqlsh to modify CQL3 tables instead.");
state().hasColumnFamilyAccess(cf_def.keyspace, cf_def.name, Permission.ALTER);
[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by sl...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/thrift/CassandraServer.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4444fd6f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4444fd6f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4444fd6f
Branch: refs/heads/cassandra-2.0
Commit: 4444fd6ff7464bede6dbcc634ffd3ff8cf1650e7
Parents: 25471ba 1ac6019
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Nov 18 17:31:49 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Nov 18 17:31:49 2013 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------