Skip to content

Conversation

@sanpwc
Copy link
Contributor

@sanpwc sanpwc commented Sep 7, 2021

NOT FOR MERGE!

sanpwc and others added 19 commits September 7, 2021 19:53
…-17676

# Conflicts:
#	modules/affinity/src/test/java/org/apache/ignite/internal/affinity/AffinityManagerTest.java
#	modules/client-common/src/main/java/org/apache/ignite/client/proto/ClientMsgPackType.java
#	modules/configuration/src/main/java/org/apache/ignite/internal/configuration/ConfigurationChanger.java
#	modules/configuration/src/main/java/org/apache/ignite/internal/configuration/SuperRoot.java
#	modules/configuration/src/main/java/org/apache/ignite/internal/configuration/asm/ConfigurationAsmGenerator.java
#	modules/configuration/src/main/java/org/apache/ignite/internal/configuration/asm/SchemaClassesInfo.java
#	modules/configuration/src/main/java/org/apache/ignite/internal/configuration/hocon/HoconConfigurationVisitor.java
#	modules/configuration/src/main/java/org/apache/ignite/internal/configuration/hocon/HoconConverter.java
#	modules/configuration/src/main/java/org/apache/ignite/internal/configuration/tree/ConfigurationVisitorImpl.java
#	modules/configuration/src/main/java/org/apache/ignite/internal/configuration/tree/ConverterToMapVisitor.java
#	modules/configuration/src/main/java/org/apache/ignite/internal/configuration/util/ConfigurationUtil.java
#	modules/configuration/src/test/java/org/apache/ignite/internal/configuration/util/ConfigurationUtilTest.java
#	modules/core/src/main/java/org/apache/ignite/internal/util/CollectionUtils.java
#	modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
#	modules/schema/src/main/java/org/apache/ignite/internal/schema/SchemaDescriptor.java
#	modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
#	modules/table/src/test/java/org/apache/ignite/internal/table/KVBinaryViewOperationsTest.java
#	modules/table/src/test/java/org/apache/ignite/internal/table/TupleBuilderImplTest.java
…-17676-7

# Conflicts:
#	modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/MetaStorageManager.java
@sanpwc sanpwc closed this Sep 10, 2021
@sanpwc sanpwc deleted the ignite-17676-7 branch September 10, 2021 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant