Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/60936193 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/60936193 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/60936193 Branch: refs/heads/ignite-830 Commit: 609361932fa02880a4555788c4820ca19d742a8a Parents: a253533 c2734e4 Author: null <null> Authored: Fri May 22 16:25:18 2015 +0300 Committer: null <null> Committed: Fri May 22 16:25:18 2015 +0300 ---------------------------------------------------------------------- .../internal/interop/InteropException.java | 65 ++++++++++++++ .../processors/cache/GridCacheAdapter.java | 16 +++- .../processors/hadoop/v2/HadoopV2Context.java | 10 +-- .../testsuites/IgniteHadoopTestSuite.java | 2 +- .../config/benchmark-client-mode.properties | 89 ++++++++++++++++++++ 5 files changed, 172 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
