You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by nt...@apache.org on 2017/04/03 08:31:02 UTC
[02/50] [abbrv] ignite git commit: Merge remote-tracking branch
ignite-1.7.9 into ignite-1.8.5
Merge remote-tracking branch ignite-1.7.9 into ignite-1.8.5
Conflicts:
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
Merge remote-tracking branch ignite-1.7.9 into ignite-1.8.5
Conflicts:
docs/RELEASE_NOTES.txt
docs/community/RELEASE_NOTES.txt
modules/compatibility/src/test/java/org/gridgain/grid/compatibility/tests/GridCompatibilityAbstractTest.java
modules/core/src/main/resources/gridgain.properties
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/59ea1c2f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/59ea1c2f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/59ea1c2f
Branch: refs/heads/master
Commit: 59ea1c2fa87ee6a9e09f9bf7afc2b1ec8ff205ac
Parents: 2263283 bcb1398
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Thu Mar 16 13:43:50 2017 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Thu Mar 16 13:43:50 2017 +0300
----------------------------------------------------------------------
.../cache/DynamicCacheChangeBatch.java | 14 ++
.../service/GridServiceProcessor.java | 49 +++---
.../ignite/internal/util/IgniteUtils.java | 14 +-
.../communication/tcp/TcpCommunicationSpi.java | 25 +++
.../GridServiceContinuousQueryRedeploy.java | 167 +++++++++++++++++++
.../testsuites/IgniteKernalSelfTestSuite.java | 2 +
6 files changed, 241 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/59ea1c2f/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/59ea1c2f/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/59ea1c2f/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/59ea1c2f/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
index b28619c,5977702..4f771d6
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
@@@ -144,7 -144,7 +145,8 @@@ public class IgniteKernalSelfTestSuite
suite.addTestSuite(GridServiceProxyClientReconnectSelfTest.class);
suite.addTestSuite(IgniteServiceReassignmentTest.class);
suite.addTestSuite(IgniteServiceProxyTimeoutInitializedTest.class);
+ suite.addTestSuite(IgniteServiceDynamicCachesSelfTest.class);
+ suite.addTestSuite(GridServiceContinuousQueryRedeploy.class);
suite.addTestSuite(IgniteServiceDeploymentClassLoadingDefaultMarshallerTest.class);
suite.addTestSuite(IgniteServiceDeploymentClassLoadingOptimizedMarshallerTest.class);