Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6466adf5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6466adf5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6466adf5 Branch: refs/heads/ignite-3478 Commit: 6466adf54f017219a16cf9835ee0214853db269e Parents: d46a039 031f63c Author: sboikov <[email protected]> Authored: Fri Oct 27 15:14:39 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri Oct 27 15:14:39 2017 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 6 + .../org/apache/ignite/internal/IgnitionEx.java | 34 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 52 +++- .../ignite/spi/discovery/tcp/ServerImpl.java | 311 ++++++++++--------- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 4 +- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 20 +- .../tcp/TcpClientDiscoverySpiSelfTest.java | 275 +++++++++++++++- .../Binary/BinaryBuilderSelfTest.cs | 10 +- .../Binary/EnumsTest.cs | 2 +- .../Client/Cache/CacheTest.cs | 42 +++ .../Client/RawSocketTest.cs | 2 +- .../ProjectFilesTest.cs | 8 +- .../Impl/Binary/BinaryUtils.cs | 30 +- .../Impl/Binary/Marshaller.cs | 4 +- .../Impl/Binary/SerializableSerializer.cs | 18 +- 15 files changed, 597 insertions(+), 221 deletions(-) ----------------------------------------------------------------------
