Updated Branches:
refs/heads/cassandra-1.1 0e0213b60 -> d170a7a99
refs/heads/trunk 7833db260 -> dbcf00df8
Merge branch 'cassandra-1.1' into trunk
Conflicts:
src/java/org/apache/cassandra/config/Config.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dbcf00df
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dbcf00df
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dbcf00df
Branch: refs/heads/trunk
Commit: dbcf00df829aefb59cfddd97602e87e58b763cb9
Parents: 7833db2 d170a7a
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Wed Oct 3 13:46:50 2012 -0500
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Wed Oct 3 13:46:50 2012 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/Config.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dbcf00df/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/Config.java
index 83c18a4,dc16622..4f551ad
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@@ -34,8 -33,8 +34,8 @@@ public class Confi
public String partitioner;
public Boolean auto_bootstrap = true;
- public Boolean hinted_handoff_enabled = true;
- public Integer max_hint_window_in_ms = 3600 * 1000; // one hour
+ public volatile Boolean hinted_handoff_enabled = true;
- public volatile Integer max_hint_window_in_ms = Integer.MAX_VALUE;
++ public volatile Integer max_hint_window_in_ms = 3600 * 1000; // one hour
public SeedProviderDef seed_provider;
public DiskAccessMode disk_access_mode = DiskAccessMode.auto;
@@@ -94,9 -82,9 +94,9 @@@
/* if the size of columns or super-columns are more than this, indexing
will kick in */
public Integer column_index_size_in_kb = 64;
- public Integer in_memory_compaction_limit_in_mb = 256;
+ public Integer in_memory_compaction_limit_in_mb = 64;
public Integer concurrent_compactors =
Runtime.getRuntime().availableProcessors();
- public Integer compaction_throughput_mb_per_sec = 16;
+ public volatile Integer compaction_throughput_mb_per_sec = 16;
public Boolean multithreaded_compaction = false;
public Integer max_streaming_retries = 3;
