Merge branches 'ignite-973-2' and 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-973-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/234a8095 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/234a8095 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/234a8095 Branch: refs/heads/ignite-950 Commit: 234a809597bb07a7b78a51f4810ad217d9ab45a4 Parents: 712e7d5 44b187d Author: S.Vladykin <svlady...@gridgain.com> Authored: Wed Jul 1 10:39:44 2015 -0700 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Wed Jul 1 10:39:44 2015 -0700 ---------------------------------------------------------------------- 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 +- .../managers/communication/GridIoManager.java | 49 ++++++----- .../processors/cache/IgniteCacheFutureImpl.java | 42 ++++++++++ .../processors/cache/IgniteCacheProxy.java | 2 +- .../internal/util/future/IgniteFutureImpl.java | 18 ++++- .../util/nio/GridNioMessageTracker.java | 23 +++++- .../ignite/spi/discovery/tcp/ServerImpl.java | 2 +- .../core/src/main/resources/ignite.properties | 2 +- modules/core/src/test/config/tests.properties | 6 +- .../GridP2PContinuousDeploymentSelfTest.java | 2 - 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 | 16 +++- .../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 ++-- 64 files changed, 747 insertions(+), 101 deletions(-) ----------------------------------------------------------------------
