From 052e9ff98a2d2fb130fb3af4de3a5ce81d10d0a1 Mon Sep 17 00:00:00 2001 From: Sylvain Lebresne Date: Mon, 28 Nov 2011 17:02:42 +0000 Subject: [PATCH] merge from 1.0 git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1207453 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/cassandra/config/KSMetaData.java | 2 +- test/system/test_thrift_server.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/org/apache/cassandra/config/KSMetaData.java b/src/java/org/apache/cassandra/config/KSMetaData.java index 5022435fb2..a2b552d211 100644 --- a/src/java/org/apache/cassandra/config/KSMetaData.java +++ b/src/java/org/apache/cassandra/config/KSMetaData.java @@ -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 strategyClass, Map strategyOptions, CFMetaData... cfDefs) diff --git a/test/system/test_thrift_server.py b/test/system/test_thrift_server.py index a3c159ffb3..ab8e1bdbbb 100644 --- a/test/system/test_thrift_server.py +++ b/test/system/test_thrift_server.py @@ -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