Merge branches 'ignite-844' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-844
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0ad9b1b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0ad9b1b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0ad9b1b1 Branch: refs/heads/ignite-844 Commit: 0ad9b1b14151b1b92cf8499b309e668a36cfed59 Parents: 175aee2 c4bc929 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Mon May 4 15:36:46 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Mon May 4 15:36:46 2015 +0700 ---------------------------------------------------------------------- .../streaming/wordcount/CacheConfig.java | 5 --- .../java/org/apache/ignite/IgniteCache.java | 5 +++ .../apache/ignite/lang/IgniteAsyncSupport.java | 4 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 4 -- .../spi/discovery/tcp/TcpDiscoverySpi.java | 4 -- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 ++-- .../tcp/TcpClientDiscoverySelfTest.java | 8 ++++ pom.xml | 39 +++++++++++++++++--- 8 files changed, 53 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
