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 2015/12/03 14:18:11 UTC
[34/35] ignite git commit: Merge remote-tracking branch
'remotes/upstream/ignite-1.5' into ignite-1626
Merge remote-tracking branch 'remotes/upstream/ignite-1.5' into ignite-1626
Conflicts:
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b7296a2b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b7296a2b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b7296a2b
Branch: refs/heads/ignite-1626
Commit: b7296a2b3b79dc7a6d672684d38e10211c43b5be
Parents: 3143d8f 86ec37e
Author: Pavel Tupitsyn <pt...@gridgain.com>
Authored: Thu Dec 3 16:15:47 2015 +0300
Committer: Pavel Tupitsyn <pt...@gridgain.com>
Committed: Thu Dec 3 16:15:47 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 +-
.../configuration/IgniteConfiguration.java | 4 +-
.../org/apache/ignite/internal/IgnitionEx.java | 4 +-
.../GridDeploymentPerVersionStore.java | 12 +-
.../internal/portable/BinaryFieldAccessor.java | 83 ++++-
.../internal/portable/BinaryReaderExImpl.java | 11 +
.../internal/portable/BinaryWriterExImpl.java | 5 +-
.../CacheDefaultBinaryAffinityKeyMapper.java | 19 +-
.../processors/cache/GridCacheAdapter.java | 8 +-
.../processors/cache/GridCacheContext.java | 37 ++-
.../GridCacheDefaultAffinityKeyMapper.java | 9 +-
.../processors/cache/GridCacheMapEntry.java | 6 +-
.../GridCachePartitionExchangeManager.java | 40 +--
.../processors/cache/GridCachePreloader.java | 16 +-
.../cache/GridCachePreloaderAdapter.java | 7 +-
.../processors/cache/GridCacheProcessor.java | 14 +-
.../processors/cache/GridCacheProxyImpl.java | 12 +
.../processors/cache/IgniteCacheProxy.java | 24 ++
.../processors/cache/IgniteInternalCache.java | 9 +
.../distributed/dht/GridDhtLockFuture.java | 17 +-
.../dht/atomic/GridDhtAtomicCache.java | 4 +-
.../dht/preloader/GridDhtPartitionDemander.java | 71 +++--
.../dht/preloader/GridDhtPreloader.java | 31 +-
.../preloader/GridDhtPreloaderAssignments.java | 19 +-
.../distributed/near/GridNearGetFuture.java | 12 +-
.../CacheObjectBinaryProcessorImpl.java | 7 +-
.../cache/transactions/IgniteTxHandler.java | 2 +-
.../handlers/query/QueryCommandHandler.java | 2 +-
.../ignite/internal/util/IgniteUtils.java | 8 +
.../communication/tcp/TcpCommunicationSpi.java | 18 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 2 -
.../core/src/main/resources/ignite.properties | 2 +-
.../portable/BinaryMarshallerSelfTest.java | 186 +++++++++--
.../CachePutEventListenerErrorSelfTest.java | 35 +-
...cheAbstractFullApiMultithreadedSelfTest.java | 9 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 2 -
.../cache/GridCacheClearSelfTest.java | 9 +-
...inodeUpdateNearEnabledNoBackupsSelfTest.java | 9 +-
...CacheMultinodeUpdateNearEnabledSelfTest.java | 5 +
.../cache/IgniteCacheAbstractTest.java | 3 +
.../IgniteCacheStoreValueAbstractTest.java | 111 ++++---
.../cache/IgniteCacheTxPreloadNoWriteTest.java | 2 +-
...eAbstractDataStructuresFailoverSelfTest.java | 319 ++++++++++++++-----
.../CacheLockReleaseNodeLeaveTest.java | 161 ++++++++++
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 37 ++-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 3 +-
...cingDelayedPartitionMapExchangeSelfTest.java | 9 +-
.../GridCacheRebalancingAsyncSelfTest.java | 3 +-
.../GridCacheRebalancingSyncCheckDataTest.java | 98 ++++++
.../GridCacheRebalancingSyncSelfTest.java | 55 ++--
...eRebalancingUnmarshallingFailedSelfTest.java | 19 +-
.../GridCacheLocalIsolatedNodesSelfTest.java | 6 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 7 +-
.../internal/util/nio/GridNioSelfTest.java | 69 ++--
.../config/GridTestProperties.java | 3 +
.../testframework/junits/GridAbstractTest.java | 15 +
...ObjectsCacheDataStructuresSelfTestSuite.java | 4 +
...BinaryObjectsCacheExpiryPolicyTestSuite.java | 4 +
...gniteBinaryObjectsCacheRestartTestSuite.java | 4 +
.../IgniteBinaryObjectsCacheTestSuite2.java | 4 +
.../IgniteBinaryObjectsCacheTestSuite3.java | 4 +
.../IgniteBinaryObjectsCacheTestSuite4.java | 4 +
...IgniteBinaryObjectsComputeGridTestSuite.java | 4 +
.../testsuites/IgniteCacheTestSuite3.java | 2 +
.../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 | 43 ++-
125 files changed, 1420 insertions(+), 509 deletions(-)
----------------------------------------------------------------------