merge ignite-sprint-4 to ignite-695
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e5ccee43 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e5ccee43 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e5ccee43 Branch: refs/heads/ignite-695 Commit: e5ccee437d844152f10dfc6bed6a51be80ce1e32 Parents: 350c4b6 Author: Artem Shutak <ashu...@gridgain.com> Authored: Wed Apr 29 18:34:40 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Wed Apr 29 18:34:40 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridCacheColocatedFailoverSelfTest.java | 2 +- .../distributed/near/GridCachePartitionedFailoverSelfTest.java | 2 +- .../replicated/GridCacheReplicatedFailoverSelfTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e5ccee43/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedFailoverSelfTest.java index a0429cd..16feb53 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedFailoverSelfTest.java @@ -29,7 +29,7 @@ import static org.apache.ignite.cache.CacheMode.*; public class GridCacheColocatedFailoverSelfTest extends GridCacheAbstractFailoverTxSelfTest { /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-631";); + fail("https://issues.apache.org/jira/browse/IGNITE-631 or IGNITE-157"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e5ccee43/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFailoverSelfTest.java index 160905a..26cb6e5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFailoverSelfTest.java @@ -28,7 +28,7 @@ import static org.apache.ignite.cache.CacheMode.*; public class GridCachePartitionedFailoverSelfTest extends GridCacheAbstractFailoverTxSelfTest { /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-631";); + fail("https://issues.apache.org/jira/browse/IGNITE-631 or IGNITE-157"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e5ccee43/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFailoverSelfTest.java index a3874f5..1e59f81 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFailoverSelfTest.java @@ -28,7 +28,7 @@ import static org.apache.ignite.cache.CacheMode.*; public class GridCacheReplicatedFailoverSelfTest extends GridCacheAbstractFailoverTxSelfTest { /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-631";); + fail("https://issues.apache.org/jira/browse/IGNITE-631 or IGNITE-157"); } /** {@inheritDoc} */
