Merge branch 'ignite-sprint-7' into ignite-ring-18

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

Branch: refs/heads/ignite-ring-18
Commit: ef20fb81cc87c078c74dbd05b3296470c0be9a45
Parents: 4f46e69 5dff89c
Author: ivasilinets <ivasilin...@gridgain.com>
Authored: Mon Jun 29 17:40:57 2015 +0300
Committer: ivasilinets <ivasilin...@gridgain.com>
Committed: Mon Jun 29 17:40:57 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/cluster/ClusterGroup.java |   9 +-
 .../ignite/internal/GridKernalContextImpl.java  |   2 +-
 .../internal/cluster/ClusterGroupAdapter.java   |  12 +-
 .../cluster/IgniteClusterAsyncImpl.java         |   7 +-
 .../GridCachePartitionExchangeManager.java      |   6 +-
 .../processors/cache/GridCacheProcessor.java    |  62 ++++-
 .../processors/rest/GridRestProcessor.java      |   4 +-
 .../handlers/task/GridTaskCommandHandler.java   |  12 +-
 .../processors/task/GridTaskWorker.java         |   4 +-
 .../apache/ignite/internal/visor/VisorJob.java  |   2 +
 .../internal/visor/log/VisorLogSearchTask.java  |   2 +-
 .../visor/node/VisorNodeDataCollectorJob.java   |   4 +
 .../visor/query/VisorQueryCleanupTask.java      |  14 +
 .../util/VisorClusterGroupEmptyException.java   |  37 +++
 .../ignite/spi/discovery/tcp/ClientImpl.java    | 151 ++++++-----
 .../ignite/spi/discovery/tcp/ServerImpl.java    | 103 +++++--
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   3 +-
 .../internal/ClusterForHostsSelfTest.java       | 113 --------
 .../internal/ClusterGroupHostsSelfTest.java     | 141 ++++++++++
 .../cache/GridCacheDaemonNodeStopSelfTest.java  | 119 ---------
 .../IgniteDaemonNodeMarshallerCacheTest.java    | 192 ++++++++++++++
 ...achePartitionedMultiNodeFullApiSelfTest.java |   4 +-
 .../tcp/TcpClientDiscoverySpiSelfTest.java      | 265 ++++++++++++++++++-
 .../ignite/testsuites/IgniteBasicTestSuite.java |   3 +-
 .../testsuites/IgniteCacheTestSuite3.java       |   1 -
 pom.xml                                         |  12 +-
 26 files changed, 941 insertions(+), 343 deletions(-)
----------------------------------------------------------------------


Reply via email to