Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/44b00ea4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/44b00ea4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/44b00ea4 Branch: refs/heads/ignite-157-2 Commit: 44b00ea46975ca8894ffbb24d53947ff4571d075 Parents: 04369fe 139aa27 Author: avinogradov <avinogra...@gridgain.com> Authored: Thu Apr 30 18:51:39 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Thu Apr 30 18:51:39 2015 +0300 ---------------------------------------------------------------------- .../ignite/compute/ComputeTaskAdapter.java | 14 +- .../processors/cache/GridCacheAdapter.java | 503 ++++++++++--------- .../processors/cache/GridCacheProcessor.java | 109 ++-- 3 files changed, 349 insertions(+), 277 deletions(-) ----------------------------------------------------------------------
