Merge remote-tracking branch 'remotes/origin/master' into ignite-1811
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/97d0c688 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/97d0c688 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/97d0c688 Branch: refs/heads/ignite-1811 Commit: 97d0c6883c62c5349b0a5b83973ab61a6ba23bcd Parents: 0823cd6 8b0c59a Author: sboikov <[email protected]> Authored: Fri Jan 15 11:14:47 2016 +0300 Committer: sboikov <[email protected]> Committed: Fri Jan 15 11:14:47 2016 +0300 ---------------------------------------------------------------------- .../ignite/internal/IgniteVersionUtils.java | 4 +- .../internal/direct/DirectMessageReader.java | 11 +++++ .../internal/direct/DirectMessageWriter.java | 13 +++++ .../direct/state/DirectMessageState.java | 10 ++++ .../stream/v1/DirectByteBufferStreamImplV1.java | 8 +++ .../stream/v2/DirectByteBufferStreamImplV2.java | 8 +++ .../internal/util/nio/GridDirectParser.java | 52 +++++++++++++------- .../communication/tcp/TcpCommunicationSpi.java | 9 +++- .../tcp/ipfinder/TcpDiscoveryIpFinder.java | 14 ++++-- .../startup/GridRandomCommandLineLoader.java | 4 +- 10 files changed, 107 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
