Merge remote-tracking branch 'origin/main' into main · opensearch-project/opensearch-java@e5dc403 · GitHub

Commit

Merge remote-tracking branch 'origin/main' into main

Browse files

# Conflicts:
#	java-client/src/main/java/org/opensearch/client/json/DelegatingJsonpMapper.java
#	java-client/src/main/java/org/opensearch/client/json/JsonpMapperBase.java
#	java-client/src/main/java/org/opensearch/client/json/JsonpMappingException.java
#	java-client/src/test/java/org/opensearch/client/opensearch/model/VariantsTest.java

Loading branch information

lihuimingxs committed Dec 28, 2023

2 parents 00eb575 + 3dad79f commit e5dc403