Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-446
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e9e4f7ab Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e9e4f7ab Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e9e4f7ab Branch: refs/heads/ignite-646 Commit: e9e4f7ab7fc0c32938de256b7786bd880b10d2eb Parents: 70daffe 8d13aa1 Author: avinogradov <avinogra...@gridgain.com> Authored: Tue Apr 21 14:02:59 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Tue Apr 21 14:02:59 2015 +0300 ---------------------------------------------------------------------- .../examples/ScalarContinuationExample.scala | 10 +- .../ignite/compute/ComputeJobContinuation.java | 2 + .../ignite/internal/GridJobContextImpl.java | 100 +++++++++++----- .../affinity/GridAffinityAssignmentCache.java | 7 +- .../processors/job/GridJobHoldListener.java | 6 +- .../processors/job/GridJobProcessor.java | 22 ++-- .../internal/processors/job/GridJobWorker.java | 23 ++-- .../internal/GridContinuousTaskSelfTest.java | 114 +++++++++++++++++++ ...ridCachePartitionNotLoadedEventSelfTest.java | 22 +++- .../IgniteCachePutGetRestartAbstractTest.java | 39 +++++-- .../IgniteCacheTxFairAffinityNodeJoinTest.java | 35 ++++++ ...micFairAffinityMultiNodeFullApiSelfTest.java | 35 ++++++ ...nedFairAffinityMultiNodeFullApiSelfTest.java | 36 ++++++ ...dezvousAffinityMultiNodeFullApiSelfTest.java | 35 ------ .../IgniteCacheFailoverTestSuite.java | 3 +- .../IgniteCacheFullApiSelfTestSuite.java | 4 +- .../ignite/util/TestTcpCommunicationSpi.java | 54 +++++++++ 17 files changed, 440 insertions(+), 107 deletions(-) ----------------------------------------------------------------------
