Merge branch 'ignite-752' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-752
Conflicts:
modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5ac3dc7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5ac3dc7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5ac3dc7f
Branch: refs/heads/ignite-752
Commit: 5ac3dc7f26cc2da9d68c22424f6642e740a42477
Parents: a0edbbc b430d04
Author: Denis Magda <dma...@gridgain.com>
Authored: Thu Jul 23 10:40:15 2015 +0300
Committer: Denis Magda <dma...@gridgain.com>
Committed: Thu Jul 23 10:40:15 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/configuration/IgniteConfiguration.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ac3dc7f/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 6fc5893,87a841b..3402e55
---
a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@@ -190,8 -190,8 +190,8 @@@ public class IgniteConfiguration
/** Default value for cache sanity check enabled flag. */
public static final boolean DFLT_CACHE_SANITY_CHECK_ENABLED = true;
- /** Default failure detection threshold used by DiscoverySpi and
CommunicationSpi in millis. */
- /** Default node failure detection threshold in millis. */
- public static final long DFLT_FAILURE_DETECTION_THRESHOLD = 12_000;
++ /** Default failure detection threshold in millis. */
+ public static final long DFLT_FAILURE_DETECTION_THRESHOLD = 10_000;
/** Optional grid name. */
private String gridName;
