Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8c404f78 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8c404f78 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8c404f78 Branch: refs/heads/ignite-sprint-6 Commit: 8c404f78cc264ddf43c71904b9fbac40ce0ee418 Parents: 4f3292d 4d1fa72 Author: nikolay tikhonov <ntikho...@gridgain.com> Authored: Thu Jun 18 15:19:58 2015 +0300 Committer: nikolay tikhonov <ntikho...@gridgain.com> Committed: Thu Jun 18 15:19: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 | 31 +++++++++++---- .../spi/discovery/tcp/TcpDiscoverySpi.java | 41 +++++++++++++------ .../tcp/internal/TcpDiscoveryNode.java | 18 +++++++++ .../DataStreamerMultiThreadedSelfTest.java | 3 ++ 8 files changed, 115 insertions(+), 41 deletions(-) ----------------------------------------------------------------------
