Merge branch 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1058
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6d265108 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6d265108 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6d265108 Branch: refs/heads/ignite-gg-10298 Commit: 6d265108265ad2801c77e055eb8b4c900bb8325d Parents: f710cd4 1d5cfbc Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Mon Jun 29 18:41:10 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Mon Jun 29 18:41:10 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/GridKernalContextImpl.java | 2 +- .../discovery/GridDiscoveryManager.java | 6 + .../processors/cache/GridCacheProcessor.java | 62 ++++-- .../cache/GridCacheDaemonNodeStopSelfTest.java | 119 ------------ .../IgniteDaemonNodeMarshallerCacheTest.java | 192 +++++++++++++++++++ .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../testsuites/IgniteCacheTestSuite3.java | 1 - pom.xml | 12 +- 8 files changed, 257 insertions(+), 138 deletions(-) ----------------------------------------------------------------------
