Updated Branches: refs/heads/trunk 1af5865ed -> c85d4722b
Spelling and grammar errors in cassandra.yaml specific to version 2.0 patch by jhanna reviewed by dbrosius for CASSANDRA-5471 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c85d4722 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c85d4722 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c85d4722 Branch: refs/heads/trunk Commit: c85d4722bee1952756fd1c1f70f45bb6ddba53b2 Parents: 1af5865 Author: Dave Brosius <[email protected]> Authored: Mon Apr 22 11:31:25 2013 -0400 Committer: Dave Brosius <[email protected]> Committed: Mon Apr 22 11:31:25 2013 -0400 ---------------------------------------------------------------------- conf/cassandra.yaml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c85d4722/conf/cassandra.yaml ---------------------------------------------------------------------- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index c4a6f84..630b56f 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -188,7 +188,7 @@ row_cache_save_period: 0 # Defaults to SerializingCacheProvider row_cache_provider: SerializingCacheProvider -# The pluggable Memory allocation for Off heap row cache, Experiments show that JEMAlloc +# The pluggable memory allocation for off-heap row cache, Experiments show that JEMAlloc # saves some memory than the native GCC allocator. # # Supported values are: NativeAllocator, JEMallocAllocator @@ -478,7 +478,7 @@ read_request_timeout_in_ms: 10000 range_request_timeout_in_ms: 10000 # How long the coordinator should wait for writes to complete write_request_timeout_in_ms: 10000 -# how long a coordinator should continue to retry a CAS operation +# How long a coordinator should continue to retry a CAS operation # that contends with other proposals for the same row cas_contention_timeout_in_ms: 1000 # How long the coordinator should wait for truncates to complete
