cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/3] git commit: merge from 1.1
Date Fri, 11 May 2012 22:15:19 GMT
Updated Branches:
  refs/heads/cassandra-1.1 a2a28a408 -> 374fa2c2f
  refs/heads/trunk 6f65c8ca8 -> c3e6a1c31


merge from 1.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3e6a1c3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3e6a1c3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3e6a1c3

Branch: refs/heads/trunk
Commit: c3e6a1c319681987628a5c18ec69b19aa6f64af0
Parents: 6f65c8c 374fa2c
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri May 11 17:15:02 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri May 11 17:15:02 2012 -0500

----------------------------------------------------------------------
 .../org/apache/cassandra/config/KSMetaData.java    |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3e6a1c3/src/java/org/apache/cassandra/config/KSMetaData.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/KSMetaData.java
index 0fd5461,14e9cc3..cba40e5
--- a/src/java/org/apache/cassandra/config/KSMetaData.java
+++ b/src/java/org/apache/cassandra/config/KSMetaData.java
@@@ -84,9 -85,8 +84,9 @@@ public final class KSMetaDat
                                                  CFMetaData.VersionCf,
                                                  CFMetaData.SchemaKeyspacesCf,
                                                  CFMetaData.SchemaColumnFamiliesCf,
 -                                                CFMetaData.SchemaColumnsCf);
 +                                                CFMetaData.SchemaColumnsCf,
 +                                                CFMetaData.HostIdCf);
-         return new KSMetaData(Table.SYSTEM_TABLE, LocalStrategy.class, optsWithRF(1), true,
cfDefs);
+         return new KSMetaData(Table.SYSTEM_TABLE, LocalStrategy.class, Collections.<String,
String>emptyMap(), true, cfDefs);
      }
  
      public static KSMetaData testMetadata(String name, Class<? extends AbstractReplicationStrategy>
strategyClass, Map<String, String> strategyOptions, CFMetaData... cfDefs)


Mime
View raw message