Merge remote-tracking branch 'upstream/gridgain-7.5.22' into gridgain-7.5.22
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8258209e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8258209e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8258209e Branch: refs/heads/ignite-3163 Commit: 8258209e287e90368c28bbb589fce581ee60beff Parents: a4ae5fe 5cd2a77 Author: vozerov-gridgain <[email protected]> Authored: Wed May 18 14:47:55 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Wed May 18 14:47:55 2016 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 15 ++ .../ignite/internal/IgniteNodeAttributes.java | 3 + .../discovery/GridDiscoveryManager.java | 34 ++- .../service/GridServiceAssignments.java | 10 +- .../service/GridServiceProcessor.java | 215 ++++++++++++++- .../service/LazyServiceConfiguration.java | 129 +++++++++ .../service/ServiceDescriptorImpl.java | 17 +- .../ignite/services/ServiceConfiguration.java | 14 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 98 +++++++ .../GridDiscoveryManagerAttributesSelfTest.java | 63 +++++ ...yment2ClassLoadersDefaultMarshallerTest.java | 259 +++++++++++++++++++ ...eployment2ClassLoadersJdkMarshallerTest.java | 31 +++ ...ent2ClassLoadersOptimizedMarshallerTest.java | 31 +++ ...oymentClassLoadingDefaultMarshallerTest.java | 212 +++++++++++++++ ...DeploymentClassLoadingJdkMarshallerTest.java | 31 +++ ...mentClassLoadingOptimizedMarshallerTest.java | 31 +++ .../testsuites/IgniteKernalSelfTestSuite.java | 13 + .../apache/ignite/tests/p2p/NoopService.java | 41 +++ .../apache/ignite/tests/p2p/NoopService2.java | 41 +++ 19 files changed, 1255 insertions(+), 33 deletions(-) ----------------------------------------------------------------------
