Merge remote-tracking branch 'remotes/origin/ignite-gg-10299' into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8f455a9e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8f455a9e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8f455a9e Branch: refs/heads/ignite-998 Commit: 8f455a9ee27144adc2f3fe7cd8c5516d3da15fed Parents: eb415ba 2796bcc Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Jun 10 14:09:05 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Jun 10 14:09:05 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../test/java/org/apache/ignite/testframework/GridTestUtils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
