Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' 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/e4069876 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e4069876 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e4069876 Branch: refs/heads/ignite-gg-9819 Commit: e406987615bef30b759fabe466abdfdab6d70e65 Parents: 957c206 139aa27 Author: avinogradov <avinogra...@gridgain.com> Authored: Thu Apr 30 18:50:33 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Thu Apr 30 18:50:33 2015 +0300 ---------------------------------------------------------------------- .../ignite/compute/ComputeTaskAdapter.java | 14 +- .../processors/cache/GridCacheAdapter.java | 503 ++++++++++--------- .../processors/cache/GridCacheProcessor.java | 109 ++-- .../discovery/tcp/TcpClientDiscoverySpi.java | 4 - .../spi/discovery/tcp/TcpDiscoverySpi.java | 4 - .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +- .../tcp/TcpClientDiscoverySelfTest.java | 8 + pom.xml | 46 +- 8 files changed, 384 insertions(+), 312 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e4069876/pom.xml ----------------------------------------------------------------------
