ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject [7/7] ignite git commit: Merge branch 'master' into ignite-2630
Date Thu, 07 Apr 2016 14:46:43 GMT
Merge branch 'master' into ignite-2630


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

Branch: refs/heads/ignite-2630
Commit: c180c127b045a9c7ac5776cd75e63e2d9d922cf1
Parents: 6688955 f970c11
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Thu Apr 7 17:43:03 2016 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Thu Apr 7 17:43:03 2016 +0300

----------------------------------------------------------------------
 .../discovery/GridDiscoveryManager.java         |   2 +-
 .../affinity/GridAffinityAssignment.java        |  15 +
 .../affinity/GridAffinityAssignmentCache.java   |  72 +++-
 .../cache/CacheAffinitySharedManager.java       |  10 -
 .../cache/GridCacheAffinityManager.java         |  11 -
 .../processors/cache/GridCacheMapEntry.java     |   7 +-
 .../GridCachePartitionExchangeManager.java      |  16 -
 .../GridDhtPartitionsExchangeFuture.java        |   2 +-
 .../continuous/CacheContinuousQueryHandler.java |  11 +-
 .../transactions/IgniteTxLocalAdapter.java      |   2 +-
 .../continuous/GridContinuousProcessor.java     |  13 +-
 .../ignite/spi/discovery/tcp/ClientImpl.java    |   2 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |  46 +--
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  23 +-
 .../affinity/AffinityHistoryCleanupTest.java    | 414 +++++++++++++++++++
 .../IgniteClientReconnectAbstractTest.java      |   7 +-
 .../BinaryObjectOffHeapUnswapTemporaryTest.java | 362 ++++++++++++++++
 .../GridCacheBinaryObjectsAbstractSelfTest.java | 181 +++++---
 ...ffinityAssignmentNodeJoinValidationTest.java | 134 ++++++
 .../tcp/TcpClientDiscoverySpiSelfTest.java      |   8 +-
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |  39 +-
 .../TcpDiscoverySpiFailureTimeoutSelfTest.java  |  23 +-
 .../spi/discovery/tcp/TestTcpDiscoverySpi.java  |   5 +-
 .../IgniteBinaryObjectsTestSuite.java           |   6 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +
 .../testsuites/IgniteCacheTestSuite5.java       |   2 +
 26 files changed, 1213 insertions(+), 202 deletions(-)
----------------------------------------------------------------------


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


Mime
View raw message