Merge branch 'ignite-sprint-6' into ignite-917-review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c878b3ca Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c878b3ca Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c878b3ca Branch: refs/heads/ignite-917-review Commit: c878b3ca52dee11b3416cc8483374c1c10ad28a0 Parents: 38c3389 ad0a026 Author: ashutak <ashu...@gridgain.com> Authored: Thu Jun 18 16:58:58 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Thu Jun 18 16:58:58 2015 +0300 ---------------------------------------------------------------------- .../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(-) ----------------------------------------------------------------------
