You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2015/05/20 04:52:31 UTC
[35/36] incubator-ignite git commit: Merge branch 'ignite-sprint-5'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389
Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-389
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/edd1a95e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/edd1a95e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/edd1a95e
Branch: refs/heads/ignite-389
Commit: edd1a95eedabbc65d6fd45a348c5ea7292a8578a
Parents: 4d88732 f9a4dd7
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Tue May 19 11:26:15 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Tue May 19 11:26:15 2015 -0700
----------------------------------------------------------------------
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 +++
.../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 ++
.../cache/IgniteCacheNearLockValueSelfTest.java | 145 +++++++++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
27 files changed, 681 insertions(+), 291 deletions(-)
----------------------------------------------------------------------