ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [17/17] incubator-ignite git commit: Merge branch 'ignite-299' into sprint-2
Date Wed, 25 Feb 2015 19:17:56 GMT
Merge branch 'ignite-299' into sprint-2


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

Branch: refs/heads/sprint-2
Commit: e09b037033b7103b60a351fe2149b517b9303e27
Parents: b239fd3 f7affb3
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Wed Feb 25 22:15:18 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Wed Feb 25 22:15:18 2015 +0300

----------------------------------------------------------------------
 .../ComputeFibonacciContinuationExample.java    |  8 ++-
 .../examples/ScalarContinuationExample.scala    | 11 ++--
 .../java/org/apache/ignite/IgniteCluster.java   |  3 +-
 .../ignite/cluster/ClusterNodeLocalMap.java     | 60 --------------------
 .../cluster/ClusterNodeLocalMapImpl.java        | 27 ++++-----
 .../cluster/IgniteClusterAsyncImpl.java         |  3 +-
 .../internal/cluster/IgniteClusterImpl.java     |  4 +-
 .../cache/GridCacheQueryCommandHandler.java     |  7 +--
 .../VisorComputeToggleMonitoringTask.java       |  4 +-
 .../visor/node/VisorNodeDataCollectorJob.java   |  4 +-
 .../node/VisorNodeEventsCollectorTask.java      |  3 +-
 .../visor/query/VisorQueryCleanupTask.java      |  4 +-
 .../visor/query/VisorQueryNextPageTask.java     |  6 +-
 .../internal/visor/query/VisorQueryTask.java    |  4 +-
 .../internal/visor/util/VisorTaskUtils.java     |  3 +-
 .../ignite/internal/GridNodeLocalSelfTest.java  |  4 +-
 .../GridCacheConcurrentTxMultiNodeTest.java     |  2 +-
 .../ignite/loadtests/dsi/GridDsiPerfJob.java    |  3 +-
 .../marshaller/GridMarshallerAbstractTest.java  |  6 +-
 .../tests/p2p/GridP2PAwareTestUserResource.java |  5 +-
 .../tests/p2p/GridTestMessageListener.java      |  4 +-
 21 files changed, 58 insertions(+), 117 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e09b0370/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
index d674182,2593372..a9b4e57
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
@@@ -41,8 -41,8 +41,9 @@@ import java.nio.charset.*
  import java.nio.file.*;
  import java.text.*;
  import java.util.*;
+ import java.util.concurrent.*;
  import java.util.concurrent.atomic.*;
 +import java.util.zip.*;
  
  import static java.lang.System.*;
  import static org.apache.ignite.configuration.IgfsConfiguration.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e09b0370/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e09b0370/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java
----------------------------------------------------------------------


Mime
View raw message