Merge remote-tracking branch 'origin/ignite-709_2' into ignite-709_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/3251815f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3251815f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3251815f Branch: refs/heads/ignite-929 Commit: 3251815f3394878ba675bf203ac759f2f325362a Parents: 5da1bd7 97e6bd3 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Mon May 25 16:50:00 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Mon May 25 16:50:00 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 | 9 +- .../org/apache/ignite/cluster/ClusterNode.java | 5 +- .../configuration/IgniteConfiguration.java | 3 +- .../internal/GridEventConsumeHandler.java | 81 +++++++++--- .../org/apache/ignite/internal/IgnitionEx.java | 19 ++- .../internal/interop/InteropException.java | 71 ++++++++++ .../interop/InteropNoCallbackException.java | 50 +++++++ .../discovery/CustomMessageWrapper.java | 5 + .../discovery/DiscoveryCustomMessage.java | 5 + .../discovery/GridDiscoveryManager.java | 26 ++-- .../cache/DynamicCacheChangeBatch.java | 5 + .../continuous/CacheContinuousQueryManager.java | 2 +- .../continuous/AbstractContinuousMessage.java | 54 ++++++++ .../StartRoutineAckDiscoveryMessage.java | 26 ++-- .../StartRoutineDiscoveryMessage.java | 27 ++-- .../StopRoutineAckDiscoveryMessage.java | 21 +-- .../continuous/StopRoutineDiscoveryMessage.java | 23 +--- .../ignite/internal/util/IgniteUtils.java | 6 +- .../discovery/DiscoverySpiCustomMessage.java | 5 + .../discovery/tcp/TcpClientDiscoverySpi.java | 14 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 34 +++-- .../TcpDiscoveryCustomEventMessage.java | 31 ++++- .../internal/GridReleaseTypeSelfTest.java | 2 + .../GridDiscoveryManagerAliveCacheSelfTest.java | 46 ++++--- .../continuous/GridEventConsumeSelfTest.java | 2 +- ...pClientDiscoveryMarshallerCheckSelfTest.java | 2 + .../tcp/TcpClientDiscoverySpiSelfTest.java | 36 +++-- .../tcp/TcpDiscoveryConcurrentStartTest.java | 2 + .../tcp/TcpDiscoveryMultiThreadedTest.java | 2 + .../processors/hadoop/v2/HadoopV2Context.java | 10 +- .../testsuites/IgniteHadoopTestSuite.java | 2 +- ...niteCacheP2pUnmarshallingQueryErrorTest.java | 3 +- 36 files changed, 631 insertions(+), 221 deletions(-) ----------------------------------------------------------------------
