Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-23
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2b679829 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2b679829 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2b679829 Branch: refs/heads/ignite-929 Commit: 2b679829e59571f16b3eaffa1c6de1f67c4f0396 Parents: a837fe1 092e8c7 Author: sboikov <semen.boi...@inria.fr> Authored: Mon May 25 21:50:04 2015 +0300 Committer: sboikov <semen.boi...@inria.fr> Committed: Mon May 25 21:50:04 2015 +0300 ---------------------------------------------------------------------- .gitignore | 3 +- dev-tools/slurp.sh | 74 +++++++++++ dev-tools/src/main/groovy/jiraslurp.groovy | 132 +++++++++++-------- .../ClientAbstractConnectivitySelfTest.java | 14 ++ .../main/java/org/apache/ignite/Ignition.java | 17 ++- .../org/apache/ignite/cluster/ClusterNode.java | 24 +++- .../configuration/IgniteConfiguration.java | 4 +- .../internal/GridEventConsumeHandler.java | 96 ++++++++++---- .../apache/ignite/internal/IgniteKernal.java | 6 +- .../org/apache/ignite/internal/IgnitionEx.java | 27 ++-- .../internal/interop/InteropException.java | 71 ++++++++++ .../interop/InteropNoCallbackException.java | 50 +++++++ .../ignite/internal/util/IgniteUtils.java | 6 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 88 +++++++++---- .../tcp/TcpClientDiscoverySpiMBean.java | 8 -- .../internal/GridReleaseTypeSelfTest.java | 2 + .../GridDiscoveryManagerAliveCacheSelfTest.java | 5 +- ...pClientDiscoveryMarshallerCheckSelfTest.java | 2 + .../tcp/TcpClientDiscoverySpiSelfTest.java | 2 + .../tcp/TcpDiscoveryConcurrentStartTest.java | 2 + .../tcp/TcpDiscoveryMultiThreadedTest.java | 2 + .../processors/hadoop/v2/HadoopV2Context.java | 10 +- .../testsuites/IgniteHadoopTestSuite.java | 2 +- 23 files changed, 502 insertions(+), 145 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2b679829/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java ----------------------------------------------------------------------
