You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2015/07/21 17:58:05 UTC
[1/2] incubator-ignite git commit: review
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-323 2d2a5d5d3 -> 80c4f855c
review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b21a0f14
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b21a0f14
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b21a0f14
Branch: refs/heads/ignite-323
Commit: b21a0f14b5c9c19765a21ef515877e6a386e9e2e
Parents: 6fbcf97
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Tue Jul 21 18:57:47 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Tue Jul 21 18:57:47 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/util/nio/GridNioSessionMetaKey.java | 2 +-
.../apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java | 1 -
.../spi/communication/GridAbstractCommunicationSelfTest.java | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b21a0f14/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionMetaKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionMetaKey.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionMetaKey.java
index a4435f3..004c327 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionMetaKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioSessionMetaKey.java
@@ -44,7 +44,7 @@ public enum GridNioSessionMetaKey {
/** Message writer. */
MSG_WRITER,
- /** Ssl engine. */
+ /** SSL engine. */
SSL_ENGINE;
/** Maximum count of NIO session keys in system. */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b21a0f14/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 5331d6e..c13ae76 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -22,7 +22,6 @@ import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.client.ssl.*;
import org.apache.ignite.internal.managers.eventstorage.*;
import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.future.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b21a0f14/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java
index e43a024..2271e3b 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java
@@ -33,7 +33,6 @@ import org.apache.ignite.testframework.junits.spi.*;
import java.net.*;
import java.util.*;
import java.util.Map.*;
-import java.util.concurrent.*;
import static org.apache.ignite.internal.IgniteNodeAttributes.*;
[2/2] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-323' into ignite-323
Posted by yz...@apache.org.
Merge remote-tracking branch 'origin/ignite-323' into ignite-323
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/80c4f855
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/80c4f855
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/80c4f855
Branch: refs/heads/ignite-323
Commit: 80c4f855c855aa20aba5d1e668b44fc118c2e2d4
Parents: b21a0f1 2d2a5d5
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Tue Jul 21 18:58:00 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Tue Jul 21 18:58:00 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------