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/ea777d40
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ea777d40
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ea777d40

Branch: refs/heads/ignite-571
Commit: ea777d40f6a7e452b87a0ea592e8e0dea2e068f5
Parents: a28bc74 015420f
Author: sboikov <sboi...@gridgain.com>
Authored: Fri Apr 3 17:19:33 2015 +0300
Committer: sboikov <sboi...@gridgain.com>
Committed: Fri Apr 3 17:19:33 2015 +0300

----------------------------------------------------------------------
 .../configuration/CacheConfiguration.java       |  2 +-
 .../ignite/internal/GridCachePluginContext.java |  6 ++
 .../processors/cache/GridCacheProcessor.java    | 64 +++++++++++++-------
 .../processors/plugin/CachePluginManager.java   | 51 ++++++++++++----
 .../ignite/plugin/CachePluginContext.java       | 11 ++++
 .../ignite/plugin/CachePluginProvider.java      |  4 +-
 .../org/apache/ignite/plugin/PluginContext.java |  9 +--
 7 files changed, 106 insertions(+), 41 deletions(-)
----------------------------------------------------------------------


Reply via email to