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/08/02 07:41:29 UTC
[06/14] ignite git commit: Merge branch 'ignite-1.6.3' of
https://github.com/gridgain/apache-ignite into ignite-1.6.3-3343
Merge branch 'ignite-1.6.3' of https://github.com/gridgain/apache-ignite into ignite-1.6.3-3343
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ae19bfe2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ae19bfe2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ae19bfe2
Branch: refs/heads/ignite-3343
Commit: ae19bfe233960c9e5cf38245241d9617e340a88a
Parents: ba7af8c 4979c87
Author: iveselovskiy <iv...@gridgain.com>
Authored: Wed Jul 27 12:48:59 2016 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Wed Jul 27 12:48:59 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 +-
.../visor/node/VisorNodeDataCollectorJob.java | 25 +-
.../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 +
.../Binary/BinaryBuilderSelfTest.cs | 325 +++++++++++++++----
.../Binary/IBinaryObjectBuilder.cs | 2 +-
.../Impl/Binary/BinaryObjectBuilder.cs | 16 +-
.../Impl/Binary/BinaryWriter.cs | 133 +++++---
.../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 +++++++
40 files changed, 1426 insertions(+), 333 deletions(-)
----------------------------------------------------------------------