Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-311
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c6accc24 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c6accc24 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c6accc24 Branch: refs/heads/ignite-311 Commit: c6accc246544f748dea437a74bb7c1fb7af07e3a Parents: 4397d22 36e9236 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Feb 20 19:00:00 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Feb 20 19:00:00 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(-) ----------------------------------------------------------------------
