Updated Branches: refs/heads/trunk 7c306cbda -> 67e4fdb43
fix typo (spilleng) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/67e4fdb4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67e4fdb4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/67e4fdb4 Branch: refs/heads/trunk Commit: 67e4fdb439dfdbf3ecca7c2ef4bd35fad3714b9e Parents: 7c306cb Author: Dave Brosius <dbros...@apache.org> Authored: Thu Jun 21 15:21:23 2012 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Thu Jun 21 15:21:23 2012 -0400 ---------------------------------------------------------------------- conf/cassandra.yaml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/67e4fdb4/conf/cassandra.yaml ---------------------------------------------------------------------- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index a584448..6d499c7 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -410,7 +410,7 @@ write_rpc_timeout_in_ms: 10000 # (This can be much longer, because we need to flush all CFs # to make sure we can clear out anythink in the commitlog that could # cause truncated data to reappear.) -truncate_timeout_in_ms: 300000 +truncate_rpc_timeout_in_ms: 300000 # The default timeout for other, miscellaneous operations rpc_timeout_in_ms: 10000