You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/07/01 08:31:42 UTC

[44/44] incubator-ignite git commit: Merge branch 'ignite-sprint-7' into ignite-gg-10443

Merge branch 'ignite-sprint-7' into ignite-gg-10443


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/613e5e48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/613e5e48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/613e5e48

Branch: refs/heads/ignite-gg-10443
Commit: 613e5e481de6433a0f0dde975371e4378a059525
Parents: 10655b2 e91bc48
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Jul 1 09:17:44 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Jul 1 09:17:44 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/cluster/ClusterGroup.java |   9 +-
 .../configuration/CacheConfiguration.java       | 105 +++----
 .../configuration/NearCacheConfiguration.java   |  10 +-
 .../ignite/internal/GridKernalContextImpl.java  |   2 +-
 .../internal/cluster/ClusterGroupAdapter.java   |  12 +-
 .../cluster/IgniteClusterAsyncImpl.java         |   7 +-
 .../discovery/GridDiscoveryManager.java         |  32 +-
 .../cache/GridCacheDeploymentManager.java       |  10 +-
 .../GridCachePartitionExchangeManager.java      |   6 +-
 .../processors/cache/GridCacheProcessor.java    |  62 +++-
 .../processors/clock/GridClockServer.java       |  21 +-
 .../processors/rest/GridRestProcessor.java      |   4 +-
 .../handlers/task/GridTaskCommandHandler.java   |  12 +-
 .../processors/task/GridTaskWorker.java         |   4 +-
 .../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/ClusterForHostsSelfTest.java       | 113 --------
 .../internal/ClusterGroupHostsSelfTest.java     | 141 +++++++++
 .../IgniteTopologyPrintFormatSelfTest.java      | 289 +++++++++++++++++++
 .../cache/GridCacheDaemonNodeStopSelfTest.java  | 119 --------
 .../IgniteDaemonNodeMarshallerCacheTest.java    | 192 ++++++++++++
 ...achePartitionedMultiNodeFullApiSelfTest.java |   4 +-
 .../tcp/TcpClientDiscoverySpiSelfTest.java      | 265 ++++++++++++++++-
 .../ignite/testsuites/IgniteBasicTestSuite.java |   3 +-
 .../testsuites/IgniteCacheTestSuite3.java       |   1 -
 .../testsuites/IgniteKernalSelfTestSuite.java   |   1 +
 .../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 ++
 pom.xml                                         |  12 +-
 41 files changed, 1521 insertions(+), 434 deletions(-)
----------------------------------------------------------------------