You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/07/22 14:51:31 UTC

[1/4] incubator-ignite git commit: master - disabled test. fix in ignite-959-z

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-752 4f77035c0 -> 5f1a00038


master - disabled test. fix in ignite-959-z


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c044bb82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c044bb82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c044bb82

Branch: refs/heads/ignite-752
Commit: c044bb8278d724336d17fbc2dcd34b0957ac41ec
Parents: 8e1492a
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Jul 22 15:10:29 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Jul 22 15:10:29 2015 +0300

----------------------------------------------------------------------
 .../IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.java     | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c044bb82/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.java
index dc25af5..edc7f35 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.java
@@ -22,6 +22,11 @@ package org.apache.ignite.internal.processors.cache;
  */
 public class IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest extends IgniteCacheQueryOffheapMultiThreadedSelfTest {
     /** {@inheritDoc} */
+    @Override protected void beforeTestsStarted() throws Exception {
+        fail("IGNITE-959");
+    }
+
+    /** {@inheritDoc} */
     @Override protected boolean evictsEnabled() {
         return true;
     }


[4/4] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-752

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-752


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5f1a0003
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5f1a0003
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5f1a0003

Branch: refs/heads/ignite-752
Commit: 5f1a0003806fb79f24e5c78505e20b05b8c92bea
Parents: 4f77035 a57707f
Author: Denis Magda <dm...@gridgain.com>
Authored: Wed Jul 22 15:50:54 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Wed Jul 22 15:50:54 2015 +0300

----------------------------------------------------------------------
 .../ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java | 2 ++
 .../IgniteCacheQueryOffheapEvictsMultiThreadedSelfTest.java     | 5 +++++
 2 files changed, 7 insertions(+)
----------------------------------------------------------------------



[2/4] incubator-ignite git commit: muted failing discovery test

Posted by sb...@apache.org.
muted failing discovery test


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0b25ec22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0b25ec22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0b25ec22

Branch: refs/heads/ignite-752
Commit: 0b25ec2216f7d7c54f29cc9c4ca465c55ed8c0a1
Parents: 63575bb
Author: Denis Magda <dm...@gridgain.com>
Authored: Wed Jul 22 15:48:36 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Wed Jul 22 15:48:36 2015 +0300

----------------------------------------------------------------------
 .../ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java    | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b25ec22/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
index 9643235..69dd538 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
@@ -102,6 +102,8 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest {
      * @throws Exception If any error occurs.
      */
     public void testMultiThreadedClientsRestart() throws Exception {
+        fail("https://issues.apache.org/jira/browse/IGNITE-1139");
+
         clientFlagGlobal = false;
 
         info("Test timeout: " + (getTestTimeout() / (60 * 1000)) + " min.");


[3/4] incubator-ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite

Posted by sb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a57707f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a57707f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a57707f6

Branch: refs/heads/ignite-752
Commit: a57707f6ef387ea6f48fd878747e8c5044e7758e
Parents: 0b25ec2 c044bb8
Author: Denis Magda <dm...@gridgain.com>
Authored: Wed Jul 22 15:49:04 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Wed Jul 22 15:49:04 2015 +0300

----------------------------------------------------------------------
 modules/apache-license-gen/pom.xml              | 13 --------
 .../processors/cache/GridCacheMvccManager.java  | 14 +++++++++
 .../distributed/dht/GridDhtTxFinishFuture.java  | 13 +++++++-
 .../GridDhtPartitionsExchangeFuture.java        | 10 +++++--
 .../near/GridNearOptimisticTxPrepareFuture.java |  4 ++-
 .../GridNearPessimisticTxPrepareFuture.java     |  2 +-
 .../near/GridNearTxFinishFuture.java            | 17 ++++++++++-
 .../cache/transactions/IgniteTxManager.java     |  5 ++--
 .../cache/GridCachePutAllFailoverSelfTest.java  |  3 ++
 .../GridCacheAbstractNodeRestartSelfTest.java   |  9 ++++++
 ...NearDisabledOptimisticTxNodeRestartTest.java | 31 ++++++++++++++++++++
 .../GridCachePartitionedFailoverSelfTest.java   |  5 ----
 ...ePartitionedOptimisticTxNodeRestartTest.java | 12 +++++++-
 .../IgniteCacheFailoverTestSuite2.java          |  4 +++
 .../testsuites/IgniteCacheRestartTestSuite.java |  5 ++--
 ...QueryOffheapEvictsMultiThreadedSelfTest.java |  5 ++++
 .../org/apache/ignite/spark/IgniteContext.scala | 14 +++++++++
 17 files changed, 135 insertions(+), 31 deletions(-)
----------------------------------------------------------------------