You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2015/08/07 18:25:33 UTC
[1/2] cassandra git commit: ninja fix commutative op flag for
truncate validation
Repository: cassandra
Updated Branches:
refs/heads/trunk 47da48b6f -> cd959b0c2
ninja fix commutative op flag for truncate validation
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3be99eea
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3be99eea
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3be99eea
Branch: refs/heads/trunk
Commit: 3be99eeaa3546fecaf474d848eecca6aa0254a22
Parents: 65c695c
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri Aug 7 12:24:34 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri Aug 7 12:24:34 2015 -0400
----------------------------------------------------------------------
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/3be99eea/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 2f47452..9353d16 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -2029,7 +2029,7 @@ public class CassandraServer implements Cassandra.Iface
{
String keyspace = cState.getKeyspace();
cState.hasColumnFamilyAccess(keyspace, cfname, Permission.MODIFY);
- CFMetaData metadata = ThriftValidation.validateColumnFamily(keyspace, cfname, true);
+ CFMetaData metadata = ThriftValidation.validateColumnFamily(keyspace, cfname, false);
if (metadata.isMaterializedView())
throw new org.apache.cassandra.exceptions.InvalidRequestException("Cannot truncate Materialized Views");
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd959b0c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd959b0c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd959b0c
Branch: refs/heads/trunk
Commit: cd959b0c2c3286dce9290dc59750283c0d9557e7
Parents: 47da48b 3be99ee
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri Aug 7 12:25:14 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri Aug 7 12:25:14 2015 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/thrift/CassandraServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------