You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/04/06 10:45:48 UTC
[11/50] [abbrv] ignite git commit: Merge branch 'ignite-1.7.9-p1'
into ignite-1.8.5
Merge branch 'ignite-1.7.9-p1' into ignite-1.8.5
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3aa2a68c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3aa2a68c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3aa2a68c
Branch: refs/heads/ignite-3477-master
Commit: 3aa2a68c02879ec57c46091cd2f22a9ac4b129ad
Parents: 6e2bc4b d124004
Author: dkarachentsev <dk...@gridgain.com>
Authored: Wed Mar 22 15:22:50 2017 +0300
Committer: dkarachentsev <dk...@gridgain.com>
Committed: Wed Mar 22 15:22:50 2017 +0300
----------------------------------------------------------------------
.../service/GridServiceProcessor.java | 15 ++--
.../GridServiceProcessorStopSelfTest.java | 75 ++++++++++++++++++++
2 files changed, 83 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3aa2a68c/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index 730c6a4,bd81518..6ced5e6
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@@ -1399,7 -1399,7 +1399,7 @@@ public class GridServiceProcessor exten
return;
try {
- depExe.execute(new BusyRunnable() {
- depExe.submit(new DepRunnable() {
++ depExe.execute(new DepRunnable() {
@Override public void run0() {
onSystemCacheUpdated(deps);
}
@@@ -1586,7 -1586,7 +1586,7 @@@
else
topVer = new AffinityTopologyVersion(((DiscoveryEvent)evt).topologyVersion(), 0);
- depExe.execute(new BusyRunnable() {
- depExe.submit(new DepRunnable() {
++ depExe.execute(new DepRunnable() {
@Override public void run0() {
ClusterNode oldest = ctx.discovery().oldestAliveCacheServerNode(topVer);