Merge branch 'sprint-2' into ignite-299
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f7affb3e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f7affb3e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f7affb3e Branch: refs/heads/ignite-sql-tests Commit: f7affb3ef31accd77d91cbb38d7cc7f75426c07c Parents: 4ba5d0e 36e9236 Author: Artem Shutak <ashu...@gridgain.com> Authored: Fri Feb 20 16:33:22 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Fri Feb 20 16:33:22 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(-) ----------------------------------------------------------------------
