Permalink
Browse files

Merge branch 'cassandra-2.1' into trunk

  • Loading branch information...
2 parents 9c4824d + 7e9cdff commit 30f438ff4da5143f53434d6a1d62e0628aa5fe89 @driftx driftx committed Feb 27, 2014
Showing with 2 additions and 1 deletion.
  1. +1 −0 CHANGES.txt
  2. +1 −1 doc/cql3/CQL.textile
View
@@ -89,6 +89,7 @@ Merged from 1.2:
* Fix snapshot repair not snapshotting coordinator itself (CASSANDRA-6713)
* Support negative timestamps for CQL3 dates in query string (CASSANDRA-6718)
* Avoid NPEs when receiving table changes for an unknown keyspace (CASSANDRA-5631)
+ * Fix bootstrapping when there is no schema (CASSANDRA-6685)
2.0.5
View
@@ -542,7 +542,7 @@ h4(#updateOptions). @<options>@
The @UPDATE@ and @INSERT@ statements allows to specify the following options for the insertion:
* @TIMESTAMP@: sets the timestamp for the operation. If not specified, the current time of the insertion (in microseconds) is used. This is usually a suitable default.
-* @TTL@: allows to specify an optional Time To Live (in seconds) for the inserted values. If set, the inserted values are automatically removed from the database after the specified time. Note that the TTL concerns the inserted values, not the column themselves. This means that any subsequent update of the column will also reset the TTL (to whatever TTL is specified in that update). By default, values never expire.
+* @TTL@: allows to specify an optional Time To Live (in seconds) for the inserted values. If set, the inserted values are automatically removed from the database after the specified time. Note that the TTL concerns the inserted values, not the column themselves. This means that any subsequent update of the column will also reset the TTL (to whatever TTL is specified in that update). By default, values never expire. A TTL of 0 or a negative one is equivalent to no TTL.
h3(#deleteStmt). DELETE

0 comments on commit 30f438f

Please sign in to comment.