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/f11e3574 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f11e3574 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f11e3574 Branch: refs/heads/ignite-30 Commit: f11e3574a97925d01526beb9e3aeaca9f596072a Parents: 20bc2ed cceceb6 Author: avinogradov <avinogra...@gridgain.com> Authored: Tue Apr 7 18:16:59 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Tue Apr 7 18:16:59 2015 +0300 ---------------------------------------------------------------------- bin/ignite.bat | 2 +- bin/ignite.sh | 2 +- bin/include/service.sh | 8 +- config/hadoop/default-config.xml | 15 ++-- .../streaming/StreamTransformerExample.java | 3 +- .../ipc/shmem/IpcSharedMemoryNativeLoader.java | 48 ++++++++---- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 24 +++++- .../communication/tcp/TcpCommunicationSpi.java | 14 ++-- .../discovery/tcp/TcpClientDiscoverySpi.java | 47 ++++++------ .../spi/discovery/tcp/TcpDiscoverySpi.java | 78 ++++++++++---------- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 4 +- ...ridCacheFifoBatchEvictionPolicySelfTest.java | 3 +- .../GridAbstractCommunicationSelfTest.java | 3 +- .../GridTcpCommunicationSpiAbstractTest.java | 5 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 3 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 3 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +- ...GridTcpCommunicationSpiRecoverySelfTest.java | 2 +- .../IgniteCacheEvictionSelfTestSuite.java | 1 + 20 files changed, 162 insertions(+), 114 deletions(-) ----------------------------------------------------------------------
