Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-7
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9458f125 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9458f125 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9458f125 Branch: refs/heads/ignite-843 Commit: 9458f12554579fd71a26f56d7bf191d0ec51173e Parents: edc9a1c ad0a026 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Jun 19 09:55:02 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Jun 19 09:55:02 2015 +0700 ---------------------------------------------------------------------- .../processors/cache/GridCacheUtils.java | 9 +++++ .../processors/cache/IgniteCacheProxy.java | 5 +++ .../processors/query/GridQueryProcessor.java | 7 ++++ .../communication/tcp/TcpCommunicationSpi.java | 42 ++++++++++---------- .../ignite/spi/discovery/tcp/ServerImpl.java | 35 ++++++++++++---- .../spi/discovery/tcp/TcpDiscoverySpi.java | 42 ++++++++++++++------ .../tcp/internal/TcpDiscoveryNode.java | 18 +++++++++ .../apache/ignite/internal/GridSelfTest.java | 20 ++++++---- .../DataStreamerMultiThreadedSelfTest.java | 3 ++ 9 files changed, 132 insertions(+), 49 deletions(-) ----------------------------------------------------------------------
