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/712e7d5c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/712e7d5c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/712e7d5c Branch: refs/heads/ignite-950 Commit: 712e7d5c070db6d3cb189343cbb585a72a7d2717 Parents: 211ad65 e91bc48 Author: S.Vladykin <svlady...@gridgain.com> Authored: Tue Jun 30 18:27:33 2015 -0700 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Tue Jun 30 18:27:33 2015 -0700 ---------------------------------------------------------------------- .../ClientAbstractConnectivitySelfTest.java | 4 +- .../org/apache/ignite/cluster/ClusterGroup.java | 18 +- .../org/apache/ignite/cluster/ClusterNode.java | 2 + .../ignite/compute/ComputeTaskSplitAdapter.java | 2 +- .../configuration/CacheConfiguration.java | 105 +-- .../configuration/NearCacheConfiguration.java | 10 +- .../ignite/internal/GridKernalContextImpl.java | 5 +- .../internal/cluster/ClusterGroupAdapter.java | 50 +- .../cluster/IgniteClusterAsyncImpl.java | 12 +- .../discovery/GridDiscoveryManager.java | 32 +- .../cache/GridCacheDeploymentManager.java | 10 +- .../GridCachePartitionExchangeManager.java | 6 +- .../processors/cache/GridCacheProcessor.java | 62 +- .../processors/clock/GridClockServer.java | 21 +- .../processors/plugin/CachePluginManager.java | 10 +- .../processors/rest/GridRestProcessor.java | 4 +- .../handlers/task/GridTaskCommandHandler.java | 12 +- .../processors/task/GridTaskWorker.java | 4 +- .../internal/util/GridConfigurationFinder.java | 55 +- .../ignite/internal/util/IgniteUtils.java | 6 +- .../shmem/IpcSharedMemoryServerEndpoint.java | 10 +- .../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 | 103 ++- .../spi/discovery/tcp/TcpDiscoverySpi.java | 3 +- .../TcpDiscoveryMulticastIpFinder.java | 74 +- .../core/src/test/config/spark/spark-config.xml | 46 ++ .../internal/ClusterGroupAbstractTest.java | 777 ++++++++++++++++++ .../internal/ClusterGroupHostsSelfTest.java | 141 ++++ .../ignite/internal/ClusterGroupSelfTest.java | 251 ++++++ .../internal/GridDiscoveryEventSelfTest.java | 12 +- .../internal/GridProjectionAbstractTest.java | 784 ------------------- .../ignite/internal/GridProjectionSelfTest.java | 251 ------ .../apache/ignite/internal/GridSelfTest.java | 2 +- .../IgniteTopologyPrintFormatSelfTest.java | 289 +++++++ .../cache/GridCacheDaemonNodeStopSelfTest.java | 119 --- .../IgniteDaemonNodeMarshallerCacheTest.java | 192 +++++ ...achePartitionedMultiNodeFullApiSelfTest.java | 4 +- .../internal/util/IgniteUtilsSelfTest.java | 22 + .../tcp/TcpClientDiscoverySpiSelfTest.java | 265 ++++++- .../ignite/testsuites/IgniteBasicTestSuite.java | 7 +- .../testsuites/IgniteCacheTestSuite3.java | 1 - .../testsuites/IgniteKernalSelfTestSuite.java | 1 + .../p2p/GridP2PContinuousDeploymentTask1.java | 2 +- .../ignite/schema/model/PojoDescriptor.java | 2 + .../apache/ignite/schema/model/PojoField.java | 1 + .../parser/dialect/OracleMetadataDialect.java | 2 +- .../org/apache/ignite/spark/IgniteContext.scala | 50 +- .../org/apache/ignite/spark/IgniteRddSpec.scala | 18 + .../commands/cache/VisorCacheCommand.scala | 7 +- pom.xml | 12 +- scripts/git-patch-prop.sh | 2 +- 56 files changed, 2685 insertions(+), 1405 deletions(-) ----------------------------------------------------------------------
