Merge conflict in devops/azure/chart/templates/hpa.yaml

.gitignore

NOTICE

devops/azure/chart/templates/deployment.yaml

devops/azure/chart/templates/hpa.yaml

devops/azure/release.yaml

...engroup/osdu/indexer/error/GlobalExceptionMapperCore.java

...group/osdu/indexer/service/IndexerMappingServiceImpl.java

...rg/opengroup/osdu/indexer/service/IndexerServiceImpl.java

...rg/opengroup/osdu/indexer/service/ReindexServiceImpl.java

...oup/osdu/indexer/service/StorageIndexerPayloadMapper.java

...engroup/osdu/indexer/service/impl/SchemaProviderImpl.java

...main/java/org/opengroup/osdu/indexer/util/TypeMapper.java

...oup/osdu/indexer/service/impl/SchemaProviderImplTest.java

provider/indexer-aws/pom.xml

...oup/osdu/indexer/aws/service/ElasticClientHandlerAws.java

...osdu/indexer/azure/util/IndexerQueueTaskBuilderAzure.java

provider/indexer-gcp/README.md

provider/indexer-gcp/pom.xml

...der/indexer-gcp/src/main/resources/application.properties

provider/indexer-gcp/src/main/resources/logback.xml