Merge branch 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1058
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/27add009 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/27add009 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/27add009 Branch: refs/heads/ignite-1058 Commit: 27add0090ee6043a549a6503f18877e8e86eb86b Parents: a862897 872fc38 Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Thu Jul 2 12:27:28 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Thu Jul 2 12:27:28 2015 +0300 ---------------------------------------------------------------------- assembly/dependencies-fabric.xml | 1 + examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../ignite/compute/ComputeTaskSplitAdapter.java | 2 +- .../configuration/CacheConfiguration.java | 105 +++---- .../configuration/NearCacheConfiguration.java | 10 +- .../managers/communication/GridIoManager.java | 49 ++-- .../discovery/GridDiscoveryManager.java | 26 +- .../processors/cache/IgniteCacheFutureImpl.java | 42 +++ .../processors/cache/IgniteCacheProxy.java | 2 +- .../processors/clock/GridClockServer.java | 21 +- .../internal/util/future/IgniteFutureImpl.java | 18 +- .../util/nio/GridNioMessageTracker.java | 23 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 5 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 7 +- .../TcpDiscoveryMulticastIpFinder.java | 74 ++++- .../core/src/main/resources/ignite.properties | 2 +- modules/core/src/test/config/tests.properties | 6 +- .../IgniteTopologyPrintFormatSelfTest.java | 289 +++++++++++++++++++ .../GridP2PContinuousDeploymentSelfTest.java | 2 - .../testsuites/IgniteKernalSelfTestSuite.java | 1 + modules/core/src/test/resources/helloworld.gar | Bin 6092 -> 0 bytes modules/core/src/test/resources/helloworld1.gar | Bin 6092 -> 0 bytes modules/core/src/test/resources/readme.txt | 6 - modules/docker/Dockerfile | 55 ++++ modules/docker/README.txt | 11 + modules/docker/build_users_libs.sh | 39 +++ modules/docker/download_ignite.sh | 49 ++++ modules/docker/execute.sh | 62 ++++ modules/docker/run.sh | 34 +++ modules/extdata/p2p/pom.xml | 4 +- modules/extdata/uri/META-INF/ignite.xml | 38 +++ .../extdata/uri/modules/uri-dependency/pom.xml | 42 +++ .../deployment/uri/tasks/GarHelloWorldBean.java | 60 ++++ .../src/main/resources/gar-example.properties | 18 ++ modules/extdata/uri/pom.xml | 62 +++- .../deployment/uri/tasks/GarHelloWorldTask.java | 81 ++++++ .../deployment/uri/tasks/gar-spring-bean.xml | 29 ++ modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- .../GridTaskUriDeploymentDeadlockSelfTest.java | 13 +- .../ignite/p2p/GridP2PDisabledSelfTest.java | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 14 +- 72 files changed, 1186 insertions(+), 184 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27add009/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java index b125734,d8dcc2c..e3f54da --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java @@@ -1945,9 -1865,10 +1937,10 @@@ public class GridIoManager extends Grid * @param timeout Timeout. * @param skipOnTimeout Whether message can be skipped on timeout. * @param msg Message to add immediately. + * @param msgC Message closure (may be {@code null}). */ GridCommunicationMessageSet( - GridIoPolicy plc, + byte plc, Object topic, UUID nodeId, long timeout,
