merge from 0.6

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@981066 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2010-07-31 15:16:38 +00:00
parent 63b77c5361
commit 170bd4d0a0
1 changed files with 1 additions and 1 deletions

View File

@ -185,7 +185,7 @@ request_scheduler_id: keyspace
# - name: name of the keyspace; "system" and "definitions" are
# reserved for Cassandra Internals.
# - replica_placement_strategy: the class that determines how replicas
# are distributed among nodes. Must implement IReplicaPlacementStrategy.
# are distributed among nodes. Must extend AbstractReplicationStrategy.
# Out of the box, Cassandra provides
# * org.apache.cassandra.locator.RackUnawareStrategy
# * org.apache.cassandra.locator.RackAwareStrategy