Merge branches 'ignite-22-1' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-22-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8fac20ed Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8fac20ed Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8fac20ed Branch: refs/heads/ignite-185 Commit: 8fac20ed49a79bb33c44ab69df2f51f59d6be886 Parents: a22c063 36e9236 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Fri Feb 20 17:42:51 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Fri Feb 20 17:42:51 2015 +0300 ---------------------------------------------------------------------- bin/setup-hadoop.sh | 2 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheUtils.java | 18 +++++++++++++ .../processors/cache/IgniteCacheProxy.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 28 +++++++------------- .../GridCacheAbstractJobExecutionTest.java | 15 ++++------- modules/hadoop/pom.xml | 6 ----- 7 files changed, 35 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
