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/fc17f07b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fc17f07b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fc17f07b Branch: refs/heads/ignite-648 Commit: fc17f07be91fb7851bda8cf847b5a8c4194acffe Parents: 8d8d291 7fc5595 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Thu Jun 25 12:59:42 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Thu Jun 25 12:59:42 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/GridKernalContextImpl.java | 3 +++ .../internal/processors/plugin/CachePluginManager.java | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) ----------------------------------------------------------------------