Repository: cassandra
Updated Branches:
  refs/heads/trunk e4a0a4bf6 -> 7a9b8ca4e


Clarify that now() function is calculated on the coordinator node in CQL 
documentation

patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-10900


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

Branch: refs/heads/trunk
Commit: 6d383bedd4db29277858144b4b02048df7ec8ffb
Parents: 5182376
Author: Benjamin Lerer <b.le...@gmail.com>
Authored: Thu Mar 17 09:47:46 2016 +0100
Committer: Benjamin Lerer <b.le...@gmail.com>
Committed: Thu Mar 17 10:07:37 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt          | 1 +
 doc/cql3/CQL.textile | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d383bed/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index dca4f8a..fdb5807 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.6
+ * Clarify that now() function is calculated on the coordinator node in CQL 
documentation (CASSANDRA-10900)
  * Fix bloom filter sizing with LCS (CASSANDRA-11344)
  * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092)
  * Fix intra-node serialization issue for multicolumn-restrictions 
(CASSANDRA-11196)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d383bed/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index ca68509..1130479 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -1819,7 +1819,7 @@ h3(#timeuuidFun). Timeuuid functions
 
 h4. @now@
 
-The @now@ function takes no arguments and generates a new unique timeuuid (at 
the time where the statement using it is executed). Note that this method is 
useful for insertion but is largely non-sensical in @WHERE@ clauses. For 
instance, a query of the form
+The @now@ function takes no arguments and generates, on the coordinator node, 
a new unique timeuuid (at the time where the statement using it is executed). 
Note that this method is useful for insertion but is largely non-sensical in 
@WHERE@ clauses. For instance, a query of the form
 
 bc(sample). 
 SELECT * FROM myTable WHERE t = now()

Reply via email to