Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/091369c7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/091369c7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/091369c7 Branch: refs/heads/ignite-471 Commit: 091369c751a564ea3b8273cb86145cb047a513e5 Parents: 0714c02 0d65d11 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Wed Apr 1 13:13:14 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Wed Apr 1 13:13:14 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/GridCachePluginContext.java | 2 +- .../ignite/internal/processors/plugin/CachePluginManager.java | 2 +- .../java/org/apache/ignite/plugin/CachePluginConfiguration.java | 5 ++++- .../main/java/org/apache/ignite/plugin/CachePluginContext.java | 2 +- .../main/java/org/apache/ignite/plugin/CachePluginProvider.java | 3 ++- 5 files changed, 9 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
