Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1695
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4bcc431c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4bcc431c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4bcc431c Branch: refs/heads/ignite-1695 Commit: 4bcc431ca501438351efea9ca50a256eae77ca2d Parents: 4d09d40 74f93b6 Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Tue Dec 1 16:05:26 2015 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Tue Dec 1 16:05:26 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 2 ++ examples/pom.xml | 5 ++- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml | 5 ++- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../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 +++--- .../core/src/main/resources/ignite.properties | 2 +- .../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 - modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 4 +-- modules/flume/pom.xml | 5 ++- 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/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml | 5 ++- modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac | 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 4 +-- .../Properties/AssemblyInfo.cs | 12 +++---- .../Properties/AssemblyInfo.cs | 4 +-- .../Properties/AssemblyInfo.cs | 6 ++-- .../Apache.Ignite/Properties/AssemblyInfo.cs | 4 +-- .../Properties/AssemblyInfo.cs | 4 +-- .../Properties/AssemblyInfo.cs | 4 +-- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/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/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml | 5 ++- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 6 ++-- modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml | 2 +- 94 files changed, 353 insertions(+), 192 deletions(-) ----------------------------------------------------------------------
