Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-239
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/890d6c62 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/890d6c62 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/890d6c62 Branch: refs/heads/ignite-51 Commit: 890d6c62df3b8b7a29917700341f0f58800be7ab Parents: bfb09c4 36e9236 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Feb 20 16:06:27 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Feb 20 16:06:27 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(-) ----------------------------------------------------------------------
