GitHub user dspavlov opened a pull request:
https://github.com/apache/ignite/pull/1956
Ignite 4938 & IGNITE-4947: Fix AI 2.0 TC suites
Ignite 4938 & IGNITE-4947: Fix AI 2.0 TC suites
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/gridgain/apache-ignite ignite-4938
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/ignite/pull/1956.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1956
----
commit faa8681ab35e2332a7b16210492468495eb9518e
Author: Alexander Paschenko <[email protected]>
Date: 2017-04-10T16:47:17Z
IGNITE-4938 De-pub of OptimizedMarshaller - take 1
commit a3686db055a55c87484ebad04e37f13ad06f93ce
Author: Alexander Paschenko <[email protected]>
Date: 2017-04-11T11:43:48Z
Merge branch 'master' into ignite-4938
commit 7942d585fde3fd11964f479b0442caa2ba0459d1
Author: Alexander Paschenko <[email protected]>
Date: 2017-04-11T16:10:37Z
IGNITE-4938 De-pub of OptimizedMarshaller - take 2
commit 1115ca5f81dc1a729cc16bcffd6ad5697b82e319
Author: Alexander Paschenko <[email protected]>
Date: 2017-04-12T00:44:42Z
IGNITE-4938 OptimizedMarshaller de-pub take 3 - removed redundant test
suites
commit c89cc392f6e9f3008707a532422e10ba12fe44f1
Author: Alexey Goncharuk <[email protected]>
Date: 2017-04-14T15:00:51Z
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite
into ignite-4938
Conflicts:
examples/config/filesystem/example-igfs.xml
modules/clients/src/test/config/jdbc-config.xml
modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java
modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientZipOptimizedMarshaller.java
modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedClassDescriptor.java
modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshaller.java
modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/package-info.java
modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java
modules/core/src/main/java/org/apache/ignite/marshaller/optimized/package-info.java
modules/core/src/main/resources/META-INF/classnames.properties
modules/core/src/test/config/example-cache.xml
modules/core/src/test/config/igfs-loopback.xml
modules/core/src/test/config/igfs-shmem.xml
modules/core/src/test/config/spring-start-nodes-attr.xml
modules/core/src/test/config/spring-start-nodes.xml
modules/core/src/test/config/websession/example-cache-base.xml
modules/core/src/test/java/org/apache/ignite/IgniteExternalizableAbstractTest.java
modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreOptimizedMarshallerSelfTest.java
modules/core/src/test/java/org/apache/ignite/igfs/IgfsPathSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerStopSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/package-info.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStartupInDeploymentModesTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAffinityEarlyTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxForceKeyTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorNonSerializableTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDeployment2ClassLoadersOptimizedMarshallerTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDeploymentClassLoadingOptimizedMarshallerTest.java
modules/core/src/test/java/org/apache/ignite/marshaller/DynamicProxySerializationMultiJvmSelfTest.java
modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerPerformanceTest.java
modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java
modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryMarshallerCheckSelfTest.java
modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMarshallerCheckSelfTest.java
modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariations.java
modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryBasicTestSuite.java
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteMarshallerSelfTestSuite.java
modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml
modules/hadoop/src/test/config/hadoop-fs-open-test/grid-0.xml
modules/hadoop/src/test/config/hadoop-fs-open-test/grid-1.xml
modules/hadoop/src/test/config/hadoop-fs-open-test/grid-2.xml
modules/hadoop/src/test/config/igfs-cli-config-dual-async.xml
modules/hadoop/src/test/config/igfs-cli-config-dual-sync.xml
modules/hadoop/src/test/config/igfs-cli-config-primary.xml
modules/hadoop/src/test/config/igfs-cli-config-proxy.xml
modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java
modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoClassQuerySelfTest.java
modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/FetchingQueryCursorStressTest.java
modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/marshaller-invalid.xml
modules/spring-data/src/main/java/org/apache/ignite/springdata/repository/package-info.java
modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java
modules/web/src/test/webapp2/META-INF/ignite-webapp-config.xml
modules/yardstick/config/ignite-int-max-values-offheap-config.xml
modules/yardstick/config/ignite-int-max-values-onheap-config.xml
modules/yardstick/config/ignite-int-max-values-swap-config.xml
modules/yardstick/config/ignite-jdbc-config.xml
commit f4558d844d318a130a5cb437254bcc9277b0012a
Author: Alexey Goncharuk <[email protected]>
Date: 2017-04-18T13:46:05Z
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite
into ignite-4938
commit 865b314e74ad4a86b0261c7cfb2cdca55eef7931
Author: dpavlov <[email protected]>
Date: 2017-05-15T13:12:33Z
Merge branch 'ignite-2.0' of https://git-wip-us.apache.org/repos/asf/ignite
into ignite-4938
# Conflicts:
# modules/core/src/test/config/igfs-loopback.xml
# modules/core/src/test/config/igfs-shmem.xml
#
modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheDataStructuresSelfTestSuite.java
#
modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
commit 94ec71858f5fc1183ef492be6b39a7b8ed2ec876
Author: dpavlov <[email protected]>
Date: 2017-05-15T17:59:33Z
IGNITE-4947: Fix AI 2.0 TC suites
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
