Merge remote-tracking branch 'origin/ignite-sprint-7' into ignite-sprint-7
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bade9f16 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bade9f16 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bade9f16 Branch: refs/heads/ignite-gg-10443 Commit: bade9f16b64416b4ea032699a8a651d0a3ad064f Parents: 596c538 8c55f8a Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Jun 30 10:39:09 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Jun 30 10:39:09 2015 +0700 ---------------------------------------------------------------------- .../ignite/internal/GridKernalContextImpl.java | 2 +- .../discovery/GridDiscoveryManager.java | 6 + .../cache/GridCacheDeploymentManager.java | 10 +- .../processors/cache/GridCacheProcessor.java | 62 ++++-- .../shmem/IpcSharedMemoryServerEndpoint.java | 10 +- .../core/src/test/config/spark/spark-config.xml | 46 +++++ .../cache/GridCacheDaemonNodeStopSelfTest.java | 119 ------------ .../IgniteDaemonNodeMarshallerCacheTest.java | 192 +++++++++++++++++++ .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../testsuites/IgniteCacheTestSuite3.java | 1 - .../org/apache/ignite/spark/IgniteContext.scala | 50 ++++- .../org/apache/ignite/spark/IgniteRddSpec.scala | 18 ++ pom.xml | 12 +- 13 files changed, 380 insertions(+), 149 deletions(-) ----------------------------------------------------------------------
