cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Date Tue, 31 Mar 2015 15:21:25 GMT
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: dbe909e062e1779b59fb8566b34c6cc821d8862f
Parents: 2d7909d 963dd54
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Tue Mar 31 10:21:18 2015 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Tue Mar 31 10:21:18 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/config/Config.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dbe909e0/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/Config.java
index 1e69b26,201e729..c6131f5
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@@ -62,9 -59,9 +62,9 @@@ public class Confi
      public volatile boolean hinted_handoff_enabled_global = true;
      public String hinted_handoff_enabled;
      public Set<String> hinted_handoff_enabled_by_dc = Sets.newConcurrentHashSet();
-     public volatile Integer max_hint_window_in_ms = 3600 * 1000; // one hour
+     public volatile Integer max_hint_window_in_ms = 3 * 3600 * 1000; // three hours
  
 -    public SeedProviderDef seed_provider;
 +    public ParameterizedClass seed_provider;
      public DiskAccessMode disk_access_mode = DiskAccessMode.auto;
  
      public DiskFailurePolicy disk_failure_policy = DiskFailurePolicy.ignore;


Mime
View raw message