Merge branch 'cassandra-2.1' into trunk

This commit is contained in:
Aleksey Yeschenko 2015-02-05 02:55:26 +03:00
commit 83f559003f
1 changed files with 1 additions and 0 deletions

View File

@ -328,6 +328,7 @@ Table creation supports the following other @<property>@:
|@compaction@ | _map_ | _see below_ | The compaction options to use, see below.|
|@compression@ | _map_ | _see below_ | Compression options, see below. |
|@caching@ | _simple_ | keys_only | Whether to cache keys ("key cache") and/or rows ("row cache") for this table. Valid values are: @all@, @keys_only@, @rows_only@ and @none@. |
|@default_time_to_live@ | _simple_ | 0 | The default expiration time ("TTL") in seconds for a table.|
h4(#compactionOptions). @compaction@ options