ignite-sprint-7: merge from ignite-934
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cc0936fa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cc0936fa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cc0936fa Branch: refs/heads/ignite-950 Commit: cc0936fa76eba5556402632eef5f06325206bac0 Parents: e91bc48 Author: Denis Magda <dma...@gridgain.com> Authored: Wed Jul 1 16:59:14 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Wed Jul 1 16:59:14 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/compute/ComputeTaskSplitAdapter.java | 2 +- .../org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc0936fa/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSplitAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSplitAdapter.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSplitAdapter.java index bc4b3c2..7b3b0d6 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSplitAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskSplitAdapter.java @@ -73,7 +73,7 @@ public abstract class ComputeTaskSplitAdapter<T, R> extends ComputeTaskAdapter<T /** Load balancer. */ @LoadBalancerResource - private transient ComputeLoadBalancer balancer; + private ComputeLoadBalancer balancer; /** * This is a simplified version of {@link ComputeTask#map(List, Object)} method. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc0936fa/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java index 6b3ad63..c71ccbb 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java @@ -98,8 +98,6 @@ public class GridP2PContinuousDeploymentSelfTest extends GridCommonAbstractTest */ @SuppressWarnings("unchecked") public void testDeployment() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-934";); - Ignite ignite = startGrid(GRID_NAME); Class cls = getExternalClassLoader().loadClass(TEST_TASK_1);
