natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge from 1.0 

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1207453 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sylvain Lebresne 2011-11-28 17:02:42 +00:00
parent 64b9c4e7e1
commit 052e9ff98a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/cassandra/config/KSMetaData.java
View File

@ -66,7 +66,7 @@ public final class KSMetaData
CFMetaData.IndexCf,
CFMetaData.NodeIdCf,
CFMetaData.VersionCf);
return new KSMetaData(Table.SYSTEM_TABLE, LocalStrategy.class, optsWithRF(1), false, cfDefs);
return new KSMetaData(Table.SYSTEM_TABLE, LocalStrategy.class, optsWithRF(1), true, cfDefs);
}
public static KSMetaData testMetadata(String name, Class<? extends AbstractReplicationStrategy> strategyClass, Map<String, String> strategyOptions, CFMetaData... cfDefs)

2
test/system/test_thrift_server.py
View File

@ -1197,7 +1197,7 @@ class TestMutations(ThriftTester):
assert len(kspaces) == 3, kspaces # ['Keyspace2', 'Keyspace1', 'system']
sysks = client.describe_keyspace("system")
assert sysks == kspaces[2]
assert sysks in kspaces
ks1 = client.describe_keyspace("Keyspace1")
assert ks1.strategy_options['replication_factor'] == '1', ks1.strategy_options