Merge remote-tracking branch 'remotes/origin/ignite-comm-opts2' into 
ignite-comm-balance

# Conflicts:
#       
modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/21805aef
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/21805aef
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/21805aef

Branch: refs/heads/ignite-comm-balance
Commit: 21805aef8d6a4e1b22620da326cace130f45ab5f
Parents: 51e9bf8 dbfd6ea
Author: sboikov <sboi...@gridgain.com>
Authored: Thu Sep 22 17:53:57 2016 +0300
Committer: sboikov <sboi...@gridgain.com>
Committed: Thu Sep 22 17:53:57 2016 +0300

----------------------------------------------------------------------
 .../apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java    | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/21805aef/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------

Reply via email to