Merge remote-tracking branch 'remotes/origin/master' into ignite-426
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/96e338e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/96e338e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/96e338e4 Branch: refs/heads/ignite-426 Commit: 96e338e49692f2389f6d0a63ee0bc294a888601e Parents: 37c3fe7 ad12147 Author: sboikov <sboi...@gridgain.com> Authored: Mon Aug 17 17:15:21 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Aug 17 17:15:21 2015 +0300 ---------------------------------------------------------------------- .../GridDhtUnreservedPartitionException.java | 66 ++++++++ .../cache/query/GridCacheQueryAdapter.java | 56 ++++++- .../cache/query/GridCacheQueryManager.java | 71 ++++++--- .../ignite/spi/discovery/tcp/ServerImpl.java | 83 ++++++++-- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 4 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 49 ++++-- .../tcp/internal/TcpDiscoveryNode.java | 18 +-- .../tcp/internal/TcpDiscoveryNodesRing.java | 23 +++ .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 152 ++++++++++++++++++- .../TcpDiscoverySpiFailureTimeoutSelfTest.java | 8 +- ...CacheScanPartitionQueryFallbackSelfTest.java | 96 ++++++++++++ 11 files changed, 559 insertions(+), 67 deletions(-) ----------------------------------------------------------------------
