ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dma...@apache.org
Subject [41/42] ignite git commit: Merge remote-tracking branch 'remotes/apache-main/master' into ignite-1272
Date Thu, 22 Oct 2015 13:01:57 GMT
Merge remote-tracking branch 'remotes/apache-main/master' into ignite-1272


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

Branch: refs/heads/ignite-1272
Commit: 5d94314124d3f7e8af3d975718c030f7e671afd2
Parents: a7051f1 0bc1d6f
Author: Denis Magda <dmagda@gridgain.com>
Authored: Thu Oct 22 15:53:22 2015 +0300
Committer: Denis Magda <dmagda@gridgain.com>
Committed: Thu Oct 22 15:53:22 2015 +0300

----------------------------------------------------------------------
 .../internal/portable/PortableContext.java      |  10 +-
 .../ignite/internal/util/nio/GridNioServer.java |   2 +-
 .../nio/IgniteExceptionInNioWorkerSelfTest.java | 105 +++++++++++++++++++
 .../ignite/testsuites/IgniteBasicTestSuite.java |   3 +
 4 files changed, 114 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/5d943141/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/5d943141/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
index f8d657b,0e5894d..7ee301c
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
@@@ -111,6 -112,8 +112,8 @@@ public class IgniteBasicTestSuite exten
          suite.addTestSuite(IgniteSlowClientDetectionSelfTest.class);
          suite.addTestSuite(IgniteDaemonNodeMarshallerCacheTest.class);
  
+         suite.addTestSuite(IgniteExceptionInNioWorkerSelfTest.class);
+ 
          return suite;
      }
 -}
 +}


Mime
View raw message