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/06/09 12:20:50 UTC
[1/2] incubator-ignite git commit: # ignite-648: fix compilation
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-648 8b77a7fc9 -> 5d0c2e794
# ignite-648: fix compilation
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9bc6be9e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9bc6be9e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9bc6be9e
Branch: refs/heads/ignite-648
Commit: 9bc6be9eadd6562baf646f239b1b0f9914c4508f
Parents: 8b77a7f
Author: ashutak <as...@gridgain.com>
Authored: Tue Jun 9 13:19:57 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Tue Jun 9 13:19:57 2015 +0300
----------------------------------------------------------------------
.../cache/multijvm/framework/IgniteCacheProcessProxy.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9bc6be9e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteCacheProcessProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteCacheProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteCacheProcessProxy.java
index 4c0e8d7..32c0bff 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteCacheProcessProxy.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteCacheProcessProxy.java
@@ -244,6 +244,14 @@ public class IgniteCacheProcessProxy<K, V> implements IgniteCache<K, V> {
});
}
+ @Override public Map<K, V> getAllOutTx(final Set<? extends K> keys) {
+ return (Map<K, V>)compute.call(new IgniteCallable<Object>() {
+ @Override public Object call() throws Exception {
+ return cache().getAllOutTx(keys);
+ }
+ });
+ }
+
/** {@inheritDoc} */
@Override public boolean containsKey(final K key) {
return (boolean)compute.call(new IgniteCallable<Object>() {
[2/2] incubator-ignite git commit: # ignite-648: increase timeout to
wait
Posted by sb...@apache.org.
# ignite-648: increase timeout to wait
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5d0c2e79
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5d0c2e79
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5d0c2e79
Branch: refs/heads/ignite-648
Commit: 5d0c2e79489c9cca8b68122487aa656168294526
Parents: 9bc6be9
Author: ashutak <as...@gridgain.com>
Authored: Tue Jun 9 13:21:12 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Tue Jun 9 13:21:12 2015 +0300
----------------------------------------------------------------------
.../processors/cache/multijvm/framework/IgniteExProcessProxy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d0c2e79/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteExProcessProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteExProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteExProcessProxy.java
index ffc74d7..b5b59c0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteExProcessProxy.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteExProcessProxy.java
@@ -114,7 +114,7 @@ public class IgniteExProcessProxy implements IgniteEx {
System.getProperty("surefire.test.class.path")
);
- assert rmtNodeStartedLatch.await(3, TimeUnit.SECONDS): "Remote node with id=" + id + " didn't join.";
+ assert rmtNodeStartedLatch.await(30, TimeUnit.SECONDS): "Remote node with id=" + id + " didn't join.";
gridProxies.put(cfg.getGridName(), this);