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/5dff89c6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5dff89c6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5dff89c6 Branch: refs/heads/ignite-gg-10443 Commit: 5dff89c650575b6fe92450492027e77ffce48186 Parents: a226666 15f3612 Author: avinogradov <avinogra...@gridgain.com> Authored: Mon Jun 29 15:56:02 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Mon Jun 29 15:56:02 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/GridKernalContextImpl.java | 2 +- .../processors/cache/GridCacheProcessor.java | 62 ++++-- .../cache/GridCacheDaemonNodeStopSelfTest.java | 119 ------------ .../IgniteDaemonNodeMarshallerCacheTest.java | 192 +++++++++++++++++++ .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../testsuites/IgniteCacheTestSuite3.java | 1 - 6 files changed, 245 insertions(+), 132 deletions(-) ----------------------------------------------------------------------
