Merge remote-tracking branch 'remotes/origin/gg-9466' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ee386394 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ee386394 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ee386394 Branch: refs/heads/ignite-297 Commit: ee386394f6d0c8cb034ac536e011577f34427e70 Parents: 7e23aa0 65d819c Author: sevdokimov <sevdoki...@gridgain.com> Authored: Wed Feb 18 19:46:19 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Wed Feb 18 19:46:19 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/internal/GridComponent.java | 4 ++-- .../java/org/apache/ignite/internal/GridPluginComponent.java | 2 +- .../org/apache/ignite/internal/managers/GridManagerAdapter.java | 2 +- .../ignite/internal/managers/discovery/GridDiscoveryManager.java | 4 ++-- .../apache/ignite/internal/processors/GridProcessorAdapter.java | 2 +- .../internal/processors/continuous/GridContinuousProcessor.java | 2 +- .../ignite/internal/processors/plugin/IgnitePluginProcessor.java | 4 ++-- .../src/main/java/org/apache/ignite/plugin/PluginProvider.java | 3 ++- .../apache/ignite/spi/discovery/DiscoverySpiDataExchange.java | 3 ++- .../apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java | 4 ++-- .../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 4 ++-- .../apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java | 4 ++-- .../spi/discovery/tcp/TcpDiscoverySpiStartStopSelfTest.java | 2 +- .../ignite/testframework/junits/spi/GridSpiAbstractTest.java | 2 +- 14 files changed, 22 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
