You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/08/19 16:30:31 UTC

[1/2] incubator-ignite git commit: Minor (log message fix)

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-gg-9615-1 0a5f5e336 -> 9e5fc85ac


Minor (log message fix)


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

Branch: refs/heads/ignite-gg-9615-1
Commit: e18147dd219d01c26e4cd969c31d2984f96d6f1a
Parents: e9a0d06
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Aug 19 16:36:23 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Aug 19 16:36:23 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e18147dd/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 4f354ab..6c70eb1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -4141,7 +4141,7 @@ class ServerImpl extends TcpDiscoveryImpl {
                 (hasRemoteSrvNodes = ring.hasRemoteServerNodes())) {
 
                 log.info("Local node seems to be disconnected from topology (failure detection timeout " +
-                    "is reached): [failureDetectionTimeout=" + spi.failureDetectionTimeout() +
+                    "is reached) [failureDetectionTimeout=" + spi.failureDetectionTimeout() +
                     ", connCheckFreq=" + connCheckFreq + ']');
 
                 failureThresholdReached = true;


[2/2] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-gg-9615-1

Posted by vo...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-gg-9615-1


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9e5fc85a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9e5fc85a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9e5fc85a

Branch: refs/heads/ignite-gg-9615-1
Commit: 9e5fc85ac20151c30e9bb4a69600aa2de09e4c14
Parents: 0a5f5e3 e18147d
Author: ptupitsyn <pt...@gridgain.com>
Authored: Wed Aug 19 17:30:21 2015 +0300
Committer: ptupitsyn <pt...@gridgain.com>
Committed: Wed Aug 19 17:30:21 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------