Merge branch 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-621
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ac93958d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ac93958d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ac93958d Branch: refs/heads/ignite-950 Commit: ac93958d21ef33d98bb223904131bf1bf54a7cf2 Parents: 0cb2d97 68c21ac Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Mon Jun 29 17:40:01 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Mon Jun 29 17:40:01 2015 -0700 ---------------------------------------------------------------------- .../ignite/internal/GridKernalContextImpl.java | 2 +- .../discovery/GridDiscoveryManager.java | 6 + .../cache/GridCacheDeploymentManager.java | 10 +- .../processors/cache/GridCacheProcessor.java | 62 ++++-- .../shmem/IpcSharedMemoryServerEndpoint.java | 10 +- .../apache/ignite/internal/visor/VisorJob.java | 2 + .../internal/visor/log/VisorLogSearchTask.java | 2 +- .../visor/node/VisorNodeDataCollectorJob.java | 4 + .../util/VisorClusterGroupEmptyException.java | 6 +- .../cache/GridCacheDaemonNodeStopSelfTest.java | 119 ------------ .../IgniteDaemonNodeMarshallerCacheTest.java | 192 +++++++++++++++++++ .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../testsuites/IgniteCacheTestSuite3.java | 1 - pom.xml | 12 +- 14 files changed, 282 insertions(+), 147 deletions(-) ----------------------------------------------------------------------
