Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1 Conflicts: examples/pom.xml examples/schema-import/pom.xml modules/aop/pom.xml modules/apache-license-gen/pom.xml modules/aws/pom.xml modules/camel/pom.xml modules/clients/pom.xml modules/cloud/pom.xml modules/codegen/pom.xml modules/core/pom.xml modules/core/src/main/resources/ignite.properties modules/extdata/p2p/pom.xml modules/extdata/uri/modules/uri-dependency/pom.xml modules/extdata/uri/pom.xml modules/flume/pom.xml modules/gce/pom.xml modules/geospatial/pom.xml modules/hadoop/pom.xml modules/hibernate/pom.xml modules/indexing/pom.xml modules/jcl/pom.xml modules/jms11/pom.xml modules/jta/pom.xml modules/kafka/pom.xml modules/log4j/pom.xml modules/log4j2/pom.xml modules/mesos/pom.xml modules/mqtt/pom.xml modules/rest-http/pom.xml modules/scalar-2.10/pom.xml modules/scalar/pom.xml modules/schedule/pom.xml modules/schema-import/pom.xml modules/slf4j/pom.xml modules/spark-2.10/pom.xml modules/spark/pom.xml modules/spring/pom.xml modules/ssh/pom.xml modules/tools/pom.xml modules/twitter/pom.xml modules/urideploy/pom.xml modules/visor-console-2.10/pom.xml modules/visor-console/pom.xml modules/visor-plugins/pom.xml modules/web/pom.xml modules/yardstick/pom.xml modules/yarn/pom.xml modules/zookeeper/pom.xml pom.xml
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a58c75fe Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a58c75fe Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a58c75fe Branch: refs/heads/ignite-2093 Commit: a58c75fe69e7521651dc64c81cf1f486c97efb6e Parents: 833c4f5 74f93b6 Author: Anton Vinogradov <a...@apache.org> Authored: Tue Dec 1 16:18:12 2015 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Tue Dec 1 16:18:12 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/IgnitionEx.java | 4 +-- .../CacheDefaultBinaryAffinityKeyMapper.java | 19 +++++++--- .../processors/cache/GridCacheAdapter.java | 8 +---- .../processors/cache/GridCacheContext.java | 37 ++++++++++++-------- .../GridCacheDefaultAffinityKeyMapper.java | 9 ++++- .../processors/cache/GridCacheMapEntry.java | 6 +++- .../GridCachePartitionExchangeManager.java | 23 ++++-------- .../processors/cache/GridCachePreloader.java | 5 +++ .../cache/GridCachePreloaderAdapter.java | 7 +++- .../processors/cache/GridCacheProcessor.java | 14 +++++--- .../processors/cache/GridCacheProxyImpl.java | 12 +++++++ .../processors/cache/IgniteCacheProxy.java | 24 +++++++++++++ .../processors/cache/IgniteInternalCache.java | 9 +++++ .../dht/atomic/GridDhtAtomicCache.java | 4 +-- .../dht/preloader/GridDhtPartitionDemander.java | 32 ++++++++++------- .../dht/preloader/GridDhtPreloader.java | 27 ++++++++++++++ .../CacheObjectBinaryProcessorImpl.java | 7 +++- .../cache/transactions/IgniteTxHandler.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 10 +++--- .../CachePutEventListenerErrorSelfTest.java | 35 ++++++++++-------- .../cache/GridCacheClearSelfTest.java | 9 +++-- ...inodeUpdateNearEnabledNoBackupsSelfTest.java | 9 +++-- .../cache/IgniteCacheAbstractTest.java | 3 ++ ...eAbstractDataStructuresFailoverSelfTest.java | 32 +++++++++++------ ...ObjectsCacheDataStructuresSelfTestSuite.java | 4 +++ ...BinaryObjectsCacheExpiryPolicyTestSuite.java | 4 +++ ...gniteBinaryObjectsCacheRestartTestSuite.java | 4 +++ .../IgniteBinaryObjectsCacheTestSuite2.java | 4 +++ .../IgniteBinaryObjectsCacheTestSuite3.java | 4 +++ .../IgniteBinaryObjectsCacheTestSuite4.java | 4 +++ ...IgniteBinaryObjectsComputeGridTestSuite.java | 4 +++ .../IgnitePortableCacheTestSuite.java | 1 - 32 files changed, 271 insertions(+), 105 deletions(-) ----------------------------------------------------------------------