Merge branches 'ignite-891' and 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-891
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9acbbcaa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9acbbcaa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9acbbcaa Branch: refs/heads/ignite-891 Commit: 9acbbcaaa73c239710bb5ac750f584cccc105c27 Parents: b308321 4b4158f Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Wed May 20 16:35:41 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Wed May 20 16:35:41 2015 -0700 ---------------------------------------------------------------------- LICENSE | 238 ++++++++++++++ LICENSE.txt | 238 -------------- NOTICE | 12 + NOTICE.txt | 12 - assembly/release-base.xml | 4 +- dev-tools/build.gradle | 35 +- dev-tools/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 51017 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + dev-tools/gradlew | 164 ++++++++++ dev-tools/src/main/groovy/jiraslurp.groovy | 326 ++++++++++++++----- modules/core/src/main/java/META-INF/LICENSE | 238 ++++++++++++++ modules/core/src/main/java/META-INF/NOTICE | 12 + .../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 ++ .../core/src/main/resources/ignite.properties | 2 +- .../cache/IgniteCacheNearLockValueSelfTest.java | 145 +++++++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + parent/pom.xml | 5 +- pom.xml | 41 ++- 37 files changed, 1403 insertions(+), 398 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9acbbcaa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ----------------------------------------------------------------------
