Merge remote-tracking branch 'origin/ignite-sprint-7' 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/188cd823 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/188cd823 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/188cd823 Branch: refs/heads/ignite-843 Commit: 188cd82327a41833c7884ef8b437652999a0e113 Parents: 27fbf02 6974a8e Author: ashutak <ashu...@gridgain.com> Authored: Fri Jun 19 12:54:39 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Fri Jun 19 12:54:39 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheUtils.java | 9 +++++ .../processors/cache/IgniteCacheProxy.java | 5 +++ .../processors/query/GridQueryProcessor.java | 7 ++++ .../processors/task/GridTaskProcessor.java | 3 +- .../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 ++ 10 files changed, 134 insertions(+), 50 deletions(-) ----------------------------------------------------------------------
