[27/27] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-comm-opts2' into ignite-comm-balance

2016-09-23 Thread sboikov
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:

[2/2] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-comm-opts2' into ignite-comm-balance

2016-09-22 Thread sboikov
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:

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

2016-09-22 Thread sboikov
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: #

[07/12] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-comm-opts2' into ignite-comm-balance

2016-09-22 Thread sboikov
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:

[11/12] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-comm-opts2' into ignite-comm-balance

2016-09-22 Thread sboikov
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:

[4/5] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-comm-opts2' into ignite-comm-balance

2016-09-15 Thread sboikov
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: