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 2014/03/06 10:28:56 UTC
[3/4] git commit: Fix comment post-merge
Fix comment post-merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a052a912
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a052a912
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a052a912
Branch: refs/heads/trunk
Commit: a052a912ef6feb84b1421d23d0db4df0dbbb1e58
Parents: 2cb811a
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Mar 6 10:28:31 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Mar 6 10:28:31 2014 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/cql3/statements/CQL3CasConditions.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a052a912/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java b/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
index 1749806..21b1de6 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
@@ -44,7 +44,7 @@ public class CQL3CasConditions implements CASConditions
public CQL3CasConditions(CFMetaData cfm, long now)
{
this.cfm = cfm;
- // We will use now for Column.isLive() which expects milliseconds but the argument is in microseconds.
+ // We will use now for Cell.isLive() which expects milliseconds but the argument is in microseconds.
this.now = now / 1000;
this.conditions = new TreeMap<>(cfm.comparator);
}