cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [4/4] git commit: Fix merge
Date Sun, 22 Dec 2013 17:11:16 GMT
Fix merge


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

Branch: refs/heads/trunk
Commit: 34235ad7b5722a5a5ee9680ba3a2d563a67ecc6f
Parents: 85863e2
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Sun Dec 22 20:10:59 2013 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Sun Dec 22 20:10:59 2013 +0300

----------------------------------------------------------------------
 src/java/org/apache/cassandra/thrift/ThriftValidation.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/34235ad7/src/java/org/apache/cassandra/thrift/ThriftValidation.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/ThriftValidation.java b/src/java/org/apache/cassandra/thrift/ThriftValidation.java
index b597203..d491636 100644
--- a/src/java/org/apache/cassandra/thrift/ThriftValidation.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftValidation.java
@@ -268,7 +268,7 @@ public class ThriftValidation
         if (range.count < 0)
             throw new org.apache.cassandra.exceptions.InvalidRequestException("get_slice
requires non-negative count");
 
-        int maxNameLength = org.apache.cassandra.db.Column.MAX_NAME_LENGTH;
+        int maxNameLength = Cell.MAX_NAME_LENGTH;
         if (range.start.remaining() > maxNameLength)
             throw new org.apache.cassandra.exceptions.InvalidRequestException("range start
length cannot be larger than " + maxNameLength);
         if (range.finish.remaining() > maxNameLength)


Mime
View raw message