You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/09/07 15:36:31 UTC
[1/3] ignite git commit: Fixed RAT.
Repository: ignite
Updated Branches:
refs/heads/master 5f01d00b0 -> 99187cf8f
Fixed RAT.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3e09aa34
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3e09aa34
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3e09aa34
Branch: refs/heads/master
Commit: 3e09aa340e6b9d5dac5428305501e11f87af3aa5
Parents: 55027dc
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Sep 7 12:47:05 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Sep 7 12:47:05 2015 +0300
----------------------------------------------------------------------
parent/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3e09aa34/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index eba7390..015d92f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -748,6 +748,7 @@
<exclude>src/test/portables/repo/org/apache/ignite/portable/test2/1.1/test2-1.1.jar</exclude>
<exclude>**/Makefile.am</exclude>
<exclude>**/configure.ac</exclude>
+ <exclude>**/*.sln</exclude>
<exclude>**/*.vcxproj</exclude>
<exclude>**/*.vcxproj.filters</exclude>
<exclude>**/module.def</exclude>
[3/3] ignite git commit: Merge branch 'ignite-1.4'
Posted by vo...@apache.org.
Merge branch 'ignite-1.4'
Conflicts:
parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/99187cf8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/99187cf8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/99187cf8
Branch: refs/heads/master
Commit: 99187cf8fa3499cd0e510481c4148626c7859622
Parents: 5f01d00 1fe7e95
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Sep 7 16:36:53 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Sep 7 16:36:53 2015 +0300
----------------------------------------------------------------------
.../cache/IgniteDaemonNodeMarshallerCacheTest.java | 10 ++++++++++
parent/pom.xml | 1 +
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/99187cf8/parent/pom.xml
----------------------------------------------------------------------
diff --cc parent/pom.xml
index 846211b,015d92f..f5a29cb
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@@ -749,23 -748,11 +749,24 @@@
<exclude>src/test/portables/repo/org/apache/ignite/portable/test2/1.1/test2-1.1.jar</exclude>
<exclude>**/Makefile.am</exclude>
<exclude>**/configure.ac</exclude>
+ <exclude>**/*.pc.in</exclude>
+ <exclude>**/*.sln</exclude>
<exclude>**/*.vcxproj</exclude>
+ <exclude>**/*.vcxprojrel</exclude>
<exclude>**/*.vcxproj.filters</exclude>
+ <exclude>**/*.sln</exclude>
+ <exclude>**/*.slnrel</exclude>
+ <exclude>**/*.opensdf</exclude>
<exclude>**/module.def</exclude>
<exclude>**/ignite-common.pc.in</exclude>
+ <exclude>**/*.csproj</exclude>
+ <exclude>**/*.fxcop</exclude>
+ <exclude>**/*.metaproj</exclude>
+ <exclude>**/*.metaproj.tmp</exclude>
+ <exclude>**/x64/Debug/**</exclude>
+ <exclude>**/teamcity_boost.cpp</exclude>
+ <exclude>**/teamcity_messages.h</exclude>
+ <exclude>**/teamcity_messages.cpp</exclude>
</excludes>
</configuration>
</execution>
[2/3] ignite git commit: Added in the test workaround for IGNITE-1365.
Posted by vo...@apache.org.
Added in the test workaround for IGNITE-1365.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1fe7e956
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1fe7e956
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1fe7e956
Branch: refs/heads/master
Commit: 1fe7e956995ca168e0a701d1194bd7b01adb8dec
Parents: 3e09aa3
Author: sboikov <sb...@gridgain.com>
Authored: Mon Sep 7 15:27:25 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Sep 7 15:27:25 2015 +0300
----------------------------------------------------------------------
.../cache/IgniteDaemonNodeMarshallerCacheTest.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1fe7e956/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDaemonNodeMarshallerCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDaemonNodeMarshallerCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDaemonNodeMarshallerCacheTest.java
index 8e19fe9..d463a37 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDaemonNodeMarshallerCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDaemonNodeMarshallerCacheTest.java
@@ -22,6 +22,9 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.lang.IgniteCallable;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
@@ -104,6 +107,13 @@ public class IgniteDaemonNodeMarshallerCacheTest extends GridCommonAbstractTest
awaitPartitionMapExchange();
+ // Workaround for IGNITE-1365.
+ IgniteInternalFuture<?> fut = ((IgniteKernal) daemonNode).context().cache().context().exchange().
+ affinityReadyFuture(new AffinityTopologyVersion(2, 0));
+
+ if (fut != null)
+ fut.get();
+
TestClass1 res1 = daemonNode.compute(daemonNode.cluster().forRemotes()).call(new TestCallable1());
assertNotNull(res1);