ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [47/47] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-709_3
Date Fri, 15 May 2015 14:02:49 GMT
Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-709_3

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java


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

Branch: refs/heads/ignite-709_3
Commit: fcaf3f5116a5c713b4bc07d1f8376566e7dc4eb0
Parents: 994cb14 2d90db7
Author: sboikov <sboikov@gridgain.com>
Authored: Fri May 15 18:00:31 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri May 15 18:00:31 2015 +0300

----------------------------------------------------------------------
 .../internal/events/DiscoveryCustomEvent.java   |  18 +-
 .../managers/discovery/CustomEventListener.java |  31 +
 .../discovery/CustomMessageWrapper.java         |  58 ++
 .../discovery/DiscoveryCustomMessage.java       |  43 +
 .../discovery/GridDiscoveryManager.java         |  99 ++-
 .../cache/DynamicCacheChangeBatch.java          |  15 +-
 .../GridCachePartitionExchangeManager.java      |   4 +-
 .../processors/cache/GridCacheProcessor.java    |   9 +-
 .../continuous/GridContinuousMessageType.java   |  12 -
 .../continuous/GridContinuousProcessor.java     | 796 ++++---------------
 .../processors/continuous/StartRequestData.java | 267 +++++++
 .../StartRoutineAckDiscoveryMessage.java        |  71 ++
 .../StartRoutineDiscoveryMessage.java           |  94 +++
 .../StopRoutineAckDiscoveryMessage.java         |  58 ++
 .../continuous/StopRoutineDiscoveryMessage.java |  58 ++
 .../internal/util/future/SettableFuture.java    |  94 ---
 .../ignite/spi/discovery/DiscoverySpi.java      |   7 +-
 .../discovery/DiscoverySpiCustomMessage.java    |  35 +
 .../spi/discovery/DiscoverySpiListener.java     |   5 +-
 .../discovery/tcp/TcpClientDiscoverySpi.java    | 106 ++-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      | 113 ++-
 .../TcpDiscoveryCustomEventMessage.java         |   9 +-
 ...acheTcpClientDiscoveryMultiThreadedTest.java |   9 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |   6 +-
 .../continuous/GridEventConsumeSelfTest.java    |  36 +-
 ...GridMessagingNoPeerClassLoadingSelfTest.java |   7 +-
 .../ignite/messaging/GridMessagingSelfTest.java |  13 +-
 .../discovery/AbstractDiscoverySelfTest.java    |   8 +-
 .../tcp/TcpClientDiscoverySpiSelfTest.java      |  10 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +
 30 files changed, 1156 insertions(+), 937 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fcaf3f51/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fcaf3f51/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fcaf3f51/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------


Mime
View raw message