Merge branches 'ignite-1053' and 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1053
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f8df9fac Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f8df9fac Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f8df9fac Branch: refs/heads/ignite-1053 Commit: f8df9facbe67ab9142825d54b3c27746fcde42f1 Parents: 181cbe4 da6ff64 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Jul 1 22:25:22 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Jul 1 22:25:22 2015 +0700 ---------------------------------------------------------------------- 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 +- .../org/apache/ignite/cluster/ClusterGroup.java | 9 +- .../ignite/compute/ComputeTaskSplitAdapter.java | 2 +- .../configuration/CacheConfiguration.java | 105 +++---- .../configuration/NearCacheConfiguration.java | 10 +- .../ignite/internal/GridKernalContextImpl.java | 2 +- .../internal/cluster/ClusterGroupAdapter.java | 12 +- .../cluster/IgniteClusterAsyncImpl.java | 7 +- .../managers/communication/GridIoManager.java | 49 ++-- .../discovery/GridDiscoveryManager.java | 32 +- .../cache/GridCacheDeploymentManager.java | 10 +- .../GridCachePartitionExchangeManager.java | 6 +- .../processors/cache/GridCacheProcessor.java | 62 +++- .../processors/cache/IgniteCacheFutureImpl.java | 42 +++ .../processors/cache/IgniteCacheProxy.java | 2 +- .../processors/clock/GridClockServer.java | 21 +- .../processors/rest/GridRestProcessor.java | 4 +- .../handlers/task/GridTaskCommandHandler.java | 12 +- .../processors/task/GridTaskWorker.java | 4 +- .../internal/util/future/IgniteFutureImpl.java | 18 +- .../shmem/IpcSharedMemoryServerEndpoint.java | 10 +- .../util/nio/GridNioMessageTracker.java | 23 +- .../apache/ignite/internal/visor/VisorJob.java | 2 + .../internal/visor/log/VisorLogSearchTask.java | 2 +- .../visor/node/VisorNodeDataCollectorJob.java | 4 + .../visor/query/VisorQueryCleanupTask.java | 14 + .../util/VisorClusterGroupEmptyException.java | 37 +++ .../ignite/spi/discovery/tcp/ClientImpl.java | 151 ++++++---- .../ignite/spi/discovery/tcp/ServerImpl.java | 105 +++++-- .../spi/discovery/tcp/TcpDiscoverySpi.java | 3 +- .../TcpDiscoveryMulticastIpFinder.java | 74 ++++- .../core/src/main/resources/ignite.properties | 2 +- .../core/src/test/config/spark/spark-config.xml | 46 +++ .../internal/ClusterForHostsSelfTest.java | 113 -------- .../internal/ClusterGroupHostsSelfTest.java | 141 +++++++++ .../internal/GridDiscoveryEventSelfTest.java | 12 +- .../IgniteTopologyPrintFormatSelfTest.java | 289 +++++++++++++++++++ .../cache/GridCacheDaemonNodeStopSelfTest.java | 119 -------- .../IgniteDaemonNodeMarshallerCacheTest.java | 192 ++++++++++++ ...achePartitionedMultiNodeFullApiSelfTest.java | 4 +- .../GridP2PContinuousDeploymentSelfTest.java | 2 - .../tcp/TcpClientDiscoverySpiSelfTest.java | 265 ++++++++++++++++- .../ignite/testsuites/IgniteBasicTestSuite.java | 3 +- .../testsuites/IgniteCacheTestSuite3.java | 1 - .../testsuites/IgniteKernalSelfTestSuite.java | 1 + 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 | 2 +- modules/extdata/uri/pom.xml | 2 +- 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 +- .../ignite/schema/model/PojoDescriptor.java | 2 + .../apache/ignite/schema/model/PojoField.java | 1 + .../parser/dialect/OracleMetadataDialect.java | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- .../org/apache/ignite/spark/IgniteContext.scala | 50 +++- .../org/apache/ignite/spark/IgniteRddSpec.scala | 18 ++ modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 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 +- scripts/git-patch-prop.sh | 2 +- 92 files changed, 1921 insertions(+), 512 deletions(-) ----------------------------------------------------------------------
