Updated Branches: refs/heads/trunk 22f515b37 -> 0467c19d9
Fix weird merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0467c19d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0467c19d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0467c19d Branch: refs/heads/trunk Commit: 0467c19d9df454e40710cf8fa0ac9703360b4528 Parents: 22f515b Author: Brandon Williams <[email protected]> Authored: Thu Jan 31 17:41:10 2013 -0600 Committer: Brandon Williams <[email protected]> Committed: Thu Jan 31 17:41:10 2013 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cli/CliClient.java | 2 +- .../org/apache/cassandra/config/CFMetaData.java | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0467c19d/src/java/org/apache/cassandra/cli/CliClient.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cli/CliClient.java b/src/java/org/apache/cassandra/cli/CliClient.java index 9ced778..82bbd8e 100644 --- a/src/java/org/apache/cassandra/cli/CliClient.java +++ b/src/java/org/apache/cassandra/cli/CliClient.java @@ -141,7 +141,7 @@ public class CliClient MEMTABLE_FLUSH_PERIOD_IN_MS, CACHING, DEFAULT_TIME_TO_LIVE, - SPECULATIVE_RETRY + SPECULATIVE_RETRY, POPULATE_IO_CACHE_ON_FLUSH } http://git-wip-us.apache.org/repos/asf/cassandra/blob/0467c19d/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java index 28ad094..d3ea810 100644 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@ -117,7 +117,6 @@ public final class CFMetaData + "strategy_options text" + ") WITH COMPACT STORAGE AND COMMENT='keyspace definitions' AND gc_grace_seconds=8640"); public static final CFMetaData SchemaColumnFamiliesCf = compile(9, "CREATE TABLE " + SystemTable.SCHEMA_COLUMNFAMILIES_CF + "(" -<<<<<<< HEAD + "keyspace_name text," + "columnfamily_name text," + "id int,"
