Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b78dbfff Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b78dbfff Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b78dbfff Branch: refs/heads/ignite-571 Commit: b78dbfff1c61165288ff46b8cf1407f83eba2089 Parents: 82a93c5 d2d6def Author: Artem Shutak <ashu...@gridgain.com> Authored: Fri Apr 3 16:32:20 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Fri Apr 3 16:32:20 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +++++++ .../ignite/spi/communication/tcp/TcpCommunicationSpi.java | 6 +++--- .../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 7 ------- 3 files changed, 10 insertions(+), 10 deletions(-) ----------------------------------------------------------------------