cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject git commit: Fix merge
Date Tue, 02 Apr 2013 09:44:46 GMT
Updated Branches:
  refs/heads/trunk 7005a7808 -> 0b20e139d


Fix merge


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

Branch: refs/heads/trunk
Commit: 0b20e139d64faa3147ba068c367df4bffb278c47
Parents: 7005a78
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Apr 2 11:44:39 2013 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Apr 2 11:44:39 2013 +0200

----------------------------------------------------------------------
 .../cassandra/cql3/statements/Selection.java       |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b20e139/src/java/org/apache/cassandra/cql3/statements/Selection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/Selection.java b/src/java/org/apache/cassandra/cql3/statements/Selection.java
index 6a70130..2f5b948 100644
--- a/src/java/org/apache/cassandra/cql3/statements/Selection.java
+++ b/src/java/org/apache/cassandra/cql3/statements/Selection.java
@@ -262,7 +262,7 @@ public abstract class Selection
             }
         }
 
-        private boolean isDead(IColumn c)
+        private boolean isDead(Column c)
         {
             return c == null || c.isMarkedForDelete();
         }


Mime
View raw message