You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/11/22 11:40:39 UTC
[50/50] [abbrv] ignite git commit: Merge remote-tracking branch
'remotes/community/ignite-1.7.4'
Merge remote-tracking branch 'remotes/community/ignite-1.7.4'
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5ffb8a74
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5ffb8a74
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5ffb8a74
Branch: refs/heads/master
Commit: 5ffb8a74d08d998f8258770669ecb240db41964f
Parents: 12d830d
Author: sboikov <sb...@gridgain.com>
Authored: Tue Nov 22 14:39:14 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Nov 22 14:39:14 2016 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5ffb8a74/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 b3b1e9d..9a36f1a 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
@@ -4128,7 +4128,6 @@ class ServerImpl extends TcpDiscoveryImpl {
rmCrd.subject().permissions())) {
// Node has not pass authentication.
LT.warn(log,
- null,
"Failed to authenticate local node " +
"(local authentication result is different from rest of topology) " +
"[nodeId=" + node.id() + ", addrs=" + U.addressesAsString(node) + ']',