cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Wed, 04 Feb 2015 23:55:35 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 90144989fe49ee0a1c91bcec4c6ad9fc8ce9136b
Parents: bcfb652 1467b9f
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Thu Feb 5 02:54:32 2015 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Thu Feb 5 02:54:32 2015 +0300

----------------------------------------------------------------------
 doc/cql3/CQL.textile | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/90144989/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --cc doc/cql3/CQL.textile
index 3b322d5,ab7da50..8f0f511
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@@ -327,7 -327,9 +327,8 @@@ Table creation supports the following o
  |@bloom_filter_fp_chance@     | _simple_ | 0.00075     | The target probability of false
positive of the sstable bloom filters. Said bloom filters will be sized to provide the provided
probability (thus lowering this value impact the size of bloom filters in-memory and on-disk)|
  |@compaction@                 | _map_    | _see below_ | The compaction options to use,
see below.|
  |@compression@                | _map_    | _see below_ | Compression options, see below.
|
 -|@replicate_on_write@         | _simple_ | true        | Whether to replicate data on write.
This can only be set to false for tables with counters values. Disabling this is dangerous
and can result in random lose of counters, don't disable unless you are sure to know what
you are doing|
  |@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


Mime
View raw message