Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-gg-10239
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/77c0c822 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/77c0c822 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/77c0c822 Branch: refs/heads/ignite-gg-10239 Commit: 77c0c822ff8927c001bac2e50b693b8f4c5e0f62 Parents: 6d8d86d fc17f07 Author: ptupitsyn <ptupit...@gridgain.com> Authored: Thu Jun 25 13:04:17 2015 +0300 Committer: ptupitsyn <ptupit...@gridgain.com> Committed: Thu Jun 25 13:04:17 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/compute/ComputeTaskSplitAdapter.java | 2 +- .../org/apache/ignite/internal/GridKernalContextImpl.java | 3 +++ .../internal/processors/plugin/CachePluginManager.java | 10 ++++++++-- .../tests/p2p/GridP2PContinuousDeploymentTask1.java | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
