Merge branches 'ignite-gg-9809' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9809
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a248d719 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a248d719 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a248d719 Branch: refs/heads/sprint-2 Commit: a248d719098a95ba3825d642dd4dd4b5aff134f3 Parents: 954f3ec 36e9236 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Fri Feb 20 16:25:53 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Fri Feb 20 16:25:53 2015 +0300 ---------------------------------------------------------------------- README.md | 181 ++++++++++++++++++- bin/setup-hadoop.sh | 2 +- examples/pom-standalone.xml | 2 +- .../java/org/apache/ignite/cache/GridCache.java | 48 ----- .../org/apache/ignite/internal/IgnitionEx.java | 4 +- .../internal/cluster/IgniteClusterImpl.java | 9 - .../processors/cache/GridCacheAdapter.java | 9 +- .../processors/cache/GridCacheMapEntry.java | 12 +- .../processors/cache/GridCacheProjectionEx.java | 47 +++++ .../cache/GridCacheProjectionImpl.java | 11 ++ .../processors/cache/GridCacheProxyImpl.java | 8 +- .../processors/cache/GridCacheUtils.java | 20 +- .../processors/cache/IgniteCacheProxy.java | 6 +- .../distributed/dht/GridDhtCacheAdapter.java | 4 +- .../distributed/near/GridNearCacheAdapter.java | 8 +- .../processors/query/GridQueryProcessor.java | 4 +- .../ignite/internal/util/IgniteUtils.java | 28 +-- .../internal/util/future/GridFutureAdapter.java | 8 +- .../util/future/GridFutureAdapterEx.java | 3 +- .../core/src/main/resources/ignite.properties | 3 +- .../IgniteCacheExpiryStoreLoadSelfTest.java | 6 +- .../apache/ignite/internal/GridSelfTest.java | 2 +- .../GridCacheAbstractJobExecutionTest.java | 13 +- modules/hadoop/pom.xml | 6 - pom.xml | 2 +- readme.md | 2 - 26 files changed, 312 insertions(+), 136 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a248d719/pom.xml ----------------------------------------------------------------------
