Merge branch 'ignite-sprint-5' into ignite-745
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c5571722 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c5571722 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c5571722 Branch: refs/heads/ignite-745 Commit: c5571722b597ae93b61c009e847de2c309f43a72 Parents: b165ff0 51d32fc Author: agura <ag...@gridgain.com> Authored: Thu May 21 16:23:40 2015 +0300 Committer: agura <ag...@gridgain.com> Committed: Thu May 21 16:23:40 2015 +0300 ---------------------------------------------------------------------- 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 | 431 +++++++++++++++---- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- 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 ++ .../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 +- .../core/src/main/resources/ignite.properties | 2 +- .../cache/IgniteCacheNearLockValueSelfTest.java | 145 +++++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../testsuites/IgniteCacheTestSuite2.java | 1 + modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- parent/pom.xml | 5 +- pom.xml | 43 +- 71 files changed, 1552 insertions(+), 440 deletions(-) ----------------------------------------------------------------------