Merge branches 'gg-9791' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into gg-9791
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/97585c63 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/97585c63 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/97585c63 Branch: refs/heads/ignite-312 Commit: 97585c63e9735f2f73dfb354a8f444ee24c7beea Parents: 1edbb8d 5da93f0 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Fri Feb 20 10:49:14 2015 -0800 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Fri Feb 20 10:49:14 2015 -0800 ---------------------------------------------------------------------- README.md | 181 ++++++++++++++++++- bin/setup-hadoop.sh | 2 +- examples/pom-standalone.xml | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 4 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 12 +- .../processors/cache/GridCacheUtils.java | 20 +- .../processors/cache/IgniteCacheProxy.java | 2 +- .../plugin/IgnitePluginProcessor.java | 2 +- .../processors/query/GridQueryProcessor.java | 4 +- .../ignite/internal/util/IgniteUtils.java | 28 +-- .../core/src/main/resources/ignite.properties | 3 +- .../GridCacheAbstractJobExecutionTest.java | 13 +- modules/hadoop/pom.xml | 6 - pom.xml | 2 +- readme.md | 2 - 16 files changed, 229 insertions(+), 56 deletions(-) ----------------------------------------------------------------------
