Merge remote-tracking branch 'remotes/origin/ignite-comm-opts2' into
ignite-comm-balance
# Conflicts:
#
modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit:
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:
Repository: ignite
Updated Branches:
refs/heads/ignite-comm-balance 21805aef8 -> de50ab3ef
Merge remote-tracking branch 'remotes/origin/ignite-comm-opts2' into
ignite-comm-balance
# Conflicts:
#
Merge remote-tracking branch 'remotes/origin/ignite-comm-opts2' into
ignite-comm-balance
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ffd654a7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ffd654a7
Diff:
Merge remote-tracking branch 'remotes/origin/ignite-comm-opts2' into
ignite-comm-balance
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9c87e2c7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9c87e2c7
Diff:
Merge remote-tracking branch 'remotes/origin/ignite-comm-opts2' into
ignite-comm-balance
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/807d242e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/807d242e
Diff: