You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/08/31 16:11:11 UTC
[18/18] ignite git commit: Merge branches 'ignite-843' and 'master'
of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843
Merge branches 'ignite-843' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1f165949
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1f165949
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1f165949
Branch: refs/heads/ignite-843
Commit: 1f165949240d738037acac16212da20c23c536ed
Parents: 09d3a7b 1335580
Author: AKuznetsov <ak...@gridgain.com>
Authored: Mon Aug 31 21:10:23 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Aug 31 21:10:23 2015 +0700
----------------------------------------------------------------------
DEVNOTES.txt | 22 +-
DISCLAIMER.txt | 15 -
LICENSE | 2 +-
NOTICE | 2 +-
assembly/LICENSE_FABRIC | 2 +-
assembly/LICENSE_HADOOP | 2 +-
assembly/NOTICE_FABRIC | 2 +-
assembly/NOTICE_HADOOP | 2 +-
assembly/release-base.xml | 5 -
dev-tools/slurp.sh | 2 +-
dev-tools/src/main/groovy/jiraslurp.groovy | 2 +-
modules/apache-license-gen/pom.xml | 13 +-
.../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +-
.../cloud/TcpDiscoveryCloudIpFinder.java | 2 +-
modules/core/src/main/java/META-INF/LICENSE | 2 +-
modules/core/src/main/java/META-INF/NOTICE | 2 +-
.../store/jdbc/CacheJdbcBlobStoreFactory.java | 2 +-
.../store/jdbc/CacheJdbcPojoStoreFactory.java | 2 +-
.../configuration/IgniteReflectionFactory.java | 2 +-
.../apache/ignite/internal/IgniteKernal.java | 6 +-
.../ignite/internal/IgniteNodeAttributes.java | 3 +
.../discovery/GridDiscoveryManager.java | 13 +-
.../processors/cache/GridCacheAtomicFuture.java | 5 -
.../processors/cache/GridCacheIoManager.java | 6 +-
.../processors/cache/GridCacheMvccManager.java | 62 +-
.../dht/atomic/GridDhtAtomicCache.java | 6 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 7 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 1235 +++++++++---------
.../platform/PlatformNoopProcessor.java | 66 +
.../processors/platform/PlatformProcessor.java | 111 +-
.../processors/platform/PlatformTarget.java | 74 +-
.../util/future/GridCompoundFuture.java | 3 +-
.../apache/ignite/internal/util/typedef/X.java | 1 +
.../apache/ignite/marshaller/Marshaller.java | 2 +-
.../ignite/marshaller/jdk/JdkMarshaller.java | 2 +-
.../optimized/OptimizedMarshaller.java | 2 +-
.../marshaller/portable/PortableMarshaller.java | 5 +-
.../SpringApplicationContextResource.java | 2 +-
.../checkpoint/cache/CacheCheckpointSpi.java | 2 +-
.../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +-
.../sharedfs/SharedFsCheckpointSpi.java | 2 +-
.../jobstealing/JobStealingCollisionSpi.java | 4 +-
.../PriorityQueueCollisionSpi.java | 2 +-
.../communication/tcp/TcpCommunicationSpi.java | 2 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
.../memory/MemoryEventStorageSpi.java | 2 +-
.../spi/failover/always/AlwaysFailoverSpi.java | 2 +-
.../jobstealing/JobStealingFailoverSpi.java | 2 +-
.../spi/failover/never/NeverFailoverSpi.java | 2 +-
.../apache/ignite/spi/indexing/IndexingSpi.java | 2 +-
.../adaptive/AdaptiveLoadBalancingSpi.java | 2 +-
.../roundrobin/RoundRobinLoadBalancingSpi.java | 2 +-
.../WeightedRandomLoadBalancingSpi.java | 2 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +-
.../GridDiscoveryManagerAttributesSelfTest.java | 50 +
...eCacheEntryListenerEagerTtlDisabledTest.java | 4 +-
.../IgniteCachePutRetryAbstractSelfTest.java | 282 +++-
.../dht/IgniteCachePutRetryAtomicSelfTest.java | 77 +-
...gniteCachePutRetryTransactionalSelfTest.java | 14 +-
...acheAtomicReplicatedNodeRestartSelfTest.java | 5 -
.../tcp/IgniteCacheSslStartStopSelfTest.java | 9 +-
modules/docker/download_ignite.sh | 2 +-
.../CacheHibernateBlobStoreFactory.java | 2 +-
.../log4j2/GridLog4j2InitializedTest.java | 6 +-
.../Impl/Memory/PlatformMemoryStream.cs | 3 +-
.../platform/PlatformAbstractTarget.java | 141 +-
.../platform/cache/PlatformCache.java | 135 +-
.../platform/cache/PlatformCacheIterator.java | 4 +-
.../cache/affinity/PlatformAffinity.java | 10 +-
.../query/PlatformAbstractQueryCursor.java | 4 +-
.../platform/cluster/PlatformClusterGroup.java | 21 +-
.../platform/compute/PlatformCompute.java | 11 +-
.../datastreamer/PlatformDataStreamer.java | 4 +-
.../platform/events/PlatformEvents.java | 20 +-
.../platform/messaging/PlatformMessaging.java | 11 +-
.../platform/services/PlatformServices.java | 33 +-
.../transactions/PlatformTransactions.java | 4 +-
.../rest/protocols/http/jetty/rest.html | 4 +-
modules/scalar-2.10/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
.../ant/beautifier/GridJavadocAntTask.java | 2 +-
.../spi/deployment/uri/UriDeploymentSpi.java | 2 +-
modules/yardstick/README.txt | 2 +-
parent/pom.xml | 12 +-
84 files changed, 1573 insertions(+), 1035 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1f165949/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1f165949/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1f165949/parent/pom.xml
----------------------------------------------------------------------