Merge remote-tracking branch 'remotes/origin/ignite-1064' into ignite-sprint-7
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e91bc484 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e91bc484 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e91bc484 Branch: refs/heads/ignite-950 Commit: e91bc484e224ce8a039ef5bba71aa7f093dce262 Parents: 28525ac 0ef74a1 Author: sboikov <sboi...@gridgain.com> Authored: Tue Jun 30 17:31:22 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Jun 30 17:31:22 2015 +0300 ---------------------------------------------------------------------- .../processors/clock/GridClockServer.java | 21 ++++-- .../TcpDiscoveryMulticastIpFinder.java | 74 ++++++++++++++++---- 2 files changed, 76 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
