Merge branch 'sprint-2' into ignite-283-tx
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1a0af094 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1a0af094 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1a0af094 Branch: refs/heads/ignite-283-tx Commit: 1a0af09428ab679cfa9551124c98d6831c516bc9 Parents: 94079fa 5da93f0 Author: vozerov <voze...@gridgain.com> Authored: Fri Feb 20 18:28:13 2015 +0300 Committer: vozerov <voze...@gridgain.com> Committed: Fri Feb 20 18:28:13 2015 +0300 ---------------------------------------------------------------------- bin/setup-hadoop.sh | 2 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheUtils.java | 18 +++++++++++++ .../processors/cache/IgniteCacheProxy.java | 2 +- .../plugin/IgnitePluginProcessor.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 28 +++++++------------- .../GridCacheAbstractJobExecutionTest.java | 15 ++++------- modules/hadoop/pom.xml | 6 ----- 8 files changed, 36 insertions(+), 39 deletions(-) ----------------------------------------------------------------------
