Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite
# Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java # modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java # modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java # modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/34f98a64 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/34f98a64 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/34f98a64 Branch: refs/heads/ignite-1093-2 Commit: 34f98a6418e8088b6e469b4978bd46284806996a Parents: 90e9555 1335580 Author: S.Vladykin <[email protected]> Authored: Mon Aug 31 17:27:29 2015 +0300 Committer: S.Vladykin <[email protected]> Committed: Mon Aug 31 17:27:29 2015 +0300 ---------------------------------------------------------------------- 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 | 279 ++++++------------- .../ignite/internal/IgniteNodeAttributes.java | 3 + .../discovery/GridDiscoveryManager.java | 13 +- .../platform/PlatformNoopProcessor.java | 70 ++++- .../processors/platform/PlatformProcessor.java | 113 +++++++- .../processors/platform/PlatformTarget.java | 36 ++- .../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 | 71 ++++- modules/docker/download_ignite.sh | 2 +- .../CacheHibernateBlobStoreFactory.java | 2 +- .../log4j2/GridLog4j2InitializedTest.java | 6 +- .../Impl/Memory/PlatformMemoryStream.cs | 3 +- .../platform/PlatformAbstractTarget.java | 40 +++ .../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 +- 59 files changed, 474 insertions(+), 322 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/cloud/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinder.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStoreFactory.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactory.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/configuration/IgniteReflectionFactory.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformTarget.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreFactory.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2InitializedTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/tools/src/main/java/org/apache/ignite/tools/ant/beautifier/GridJavadocAntTask.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/34f98a64/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java ----------------------------------------------------------------------
