Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	conf/cassandra.yaml
This commit is contained in:
Brandon Williams 2013-01-22 19:26:20 -06:00
commit 1559b49713
1 changed files with 2 additions and 1 deletions

View File

@ -39,7 +39,8 @@ initial_token:
# See http://wiki.apache.org/cassandra/HintedHandoff
hinted_handoff_enabled: true
# this defines the maximum amount of time a dead host will have hints
# generated. After it has been dead this long, hints will be dropped.
# generated. After it has been dead this long, new hints for it will not be
# created until it has been seen alive and gone down again.
max_hint_window_in_ms: 10800000 # 3 hours
# throttle in KB's per second, per delivery thread
hinted_handoff_throttle_in_kb: 1024