You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2018/01/09 15:12:12 UTC
[2/2] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-zk
Merge remote-tracking branch 'remotes/origin/master' into ignite-zk
# Conflicts:
# modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/elb/TcpDiscoveryElbIpFinder.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/feb1b7b8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/feb1b7b8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/feb1b7b8
Branch: refs/heads/ignite-zk
Commit: feb1b7b8bd35cdab91d51b43ec6aea0ebc9af4bf
Parents: dc8903c dd2fe1b
Author: sboikov <sb...@gridgain.com>
Authored: Tue Jan 9 18:12:04 2018 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Jan 9 18:12:04 2018 +0300
----------------------------------------------------------------------
.../ipfinder/elb/TcpDiscoveryElbIpFinder.java | 77 +++++++++++++-------
.../elb/TcpDiscoveryElbIpFinderSelfTest.java | 9 +--
.../ignite/testsuites/IgniteElbTestSuite.java | 17 +++++
3 files changed, 70 insertions(+), 33 deletions(-)
----------------------------------------------------------------------