From 034ac7d0fc961379cff1faa573ecb4df22ff8df0 Mon Sep 17 00:00:00 2001 From: Sylvain Lebresne Date: Tue, 25 Feb 2014 09:54:00 +0100 Subject: [PATCH 1/2] Document that TTL <= 0 means no TTL --- doc/cql3/CQL.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile index b18ce22387..8d853c5b3f 100644 --- a/doc/cql3/CQL.textile +++ b/doc/cql3/CQL.textile @@ -499,7 +499,7 @@ h4(#updateOptions). @@ 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 From 3af5e507525df904023f67332986ddfde3e6a4bc Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Thu, 27 Feb 2014 13:56:27 -0600 Subject: [PATCH 2/2] update changes --- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.txt b/CHANGES.txt index 11fcf184b1..53da840264 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -17,6 +17,7 @@ * 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) 1.2.15