You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/07/27 12:22:14 UTC
[6/7] ignite git commit: Merge branch 'ignite-1.6.3' into ignite-3553
Merge branch 'ignite-1.6.3' into ignite-3553
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a057618b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a057618b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a057618b
Branch: refs/heads/ignite-3553
Commit: a057618b5c02bc9b7faa4442255360a05eeec28f
Parents: abed23b 9d07e3e
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Jul 27 13:30:22 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Jul 27 13:30:22 2016 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/IgnitionEx.java | 2 +
.../internal/binary/BinaryObjectImpl.java | 11 +
.../affinity/GridAffinityProcessor.java | 117 +++++---
.../processors/cache/CacheObjectContext.java | 12 +
.../processors/cache/GridCacheAdapter.java | 8 +-
.../cache/GridCacheAffinityManager.java | 24 +-
.../processors/cache/GridCacheContext.java | 26 +-
.../processors/cache/GridCacheEntryInfo.java | 2 +-
.../processors/cache/KeyCacheObject.java | 7 +
.../processors/cache/KeyCacheObjectImpl.java | 8 +
.../cache/binary/CacheObjectBinaryContext.java | 10 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 38 ++-
.../distributed/dht/GridDhtLocalPartition.java | 2 +-
.../dht/GridDhtPartitionTopologyImpl.java | 36 ++-
.../dht/atomic/GridDhtAtomicCache.java | 6 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 15 +-
.../IgniteCacheObjectProcessorImpl.java | 69 ++++-
.../datastreamer/DataStreamerImpl.java | 6 +-
.../affinity/AffinityClientNodeSelfTest.java | 73 ++++-
.../binary/BinaryMarshallerSelfTest.java | 7 +-
.../BinaryObjectBuilderAdditionalSelfTest.java | 46 ++-
.../cache/CacheGetEntryAbstractTest.java | 2 +-
.../expiry/IgniteCacheTtlCleanupSelfTest.java | 2 +-
.../ServicePredicateAccessCacheTest.java | 4 +-
.../CacheBinaryKeyConcurrentQueryTest.java | 298 +++++++++++++++++++
.../IgniteCacheWithIndexingTestSuite.java | 2 +
.../ignite/cache/spring/SpringCacheManager.java | 17 +-
.../spring/SpringTransactionManager.java | 59 ++--
.../test/java/config/spring-transactions.xml | 4 +-
.../ignite/TestInjectionLifecycleBean.java | 42 +++
.../org/apache/ignite/spring-injection-test.xml | 43 +++
.../SpringCacheManagerContextInjectionTest.java | 126 ++++++++
.../testsuites/IgniteSpringTestSuite.java | 5 +
...gTransactionManagerContextInjectionTest.java | 125 ++++++++
35 files changed, 1059 insertions(+), 199 deletions(-)
----------------------------------------------------------------------