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/05/20 12:02:34 UTC
[17/19] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-5' into ignite-471-2
Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-471-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/379c73f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/379c73f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/379c73f6
Branch: refs/heads/ignite-471-2
Commit: 379c73f63ac5920978ed9032fb5efad939fc2b1e
Parents: 1f4dddd f9a4dd7
Author: Denis Magda <dm...@gridgain.com>
Authored: Wed May 20 08:20:04 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Wed May 20 08:20:04 2015 +0300
----------------------------------------------------------------------
LICENSE | 238 +++++++++++++++++++
LICENSE.txt | 238 -------------------
NOTICE | 12 +
NOTICE.txt | 12 -
assembly/release-base.xml | 4 +-
.../internal/GridEventConsumeHandler.java | 26 ++
.../apache/ignite/internal/IgniteKernal.java | 26 +-
.../interop/InteropAwareEventFilter.java | 37 +++
.../interop/InteropLocalEventListener.java | 28 +++
.../managers/communication/GridIoManager.java | 6 +-
.../GridLifecycleAwareMessageFilter.java | 5 +-
.../eventstorage/GridEventStorageManager.java | 24 +-
.../processors/cache/GridCacheIoManager.java | 6 +-
.../GridCachePartitionExchangeManager.java | 4 +-
.../distributed/GridDistributedTxMapping.java | 5 +-
.../distributed/dht/GridDhtCacheAdapter.java | 6 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 1 +
.../dht/atomic/GridDhtAtomicCache.java | 4 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 42 +++-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 36 ++-
.../colocated/GridDhtColocatedLockFuture.java | 4 +-
.../distributed/near/GridNearCacheEntry.java | 2 +-
.../cache/distributed/near/GridNearTxLocal.java | 5 +-
.../near/GridNearTxPrepareFutureAdapter.java | 9 +-
.../near/GridNearTxPrepareResponse.java | 28 ++-
.../transactions/IgniteTxLocalAdapter.java | 4 +-
.../cache/transactions/IgniteTxManager.java | 24 ++
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 12 +-
.../cache/IgniteCacheNearLockValueSelfTest.java | 145 +++++++++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
.../testsuites/IgniteCacheTestSuite2.java | 1 +
31 files changed, 695 insertions(+), 301 deletions(-)
----------------------------------------------------------------------