Skip to content
Snippets Groups Projects
Commit d823e9b5 authored by Smitha Manjunath's avatar Smitha Manjunath
Browse files

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

# Conflicts:
#	indexer-core/src/main/java/org/opengroup/osdu/indexer/api/CleanupIndiciesApi.java
parents f573c6c3 e99ea7b2
No related branches found
No related tags found
2 merge requests!346Merge branch 'aws-integration' into 'master',!273Delete api
Pipeline #104346 failed
Stage: review
Stage: build
Stage: coverage
Stage: containerize
Stage: scan
Stage: deploy
Stage: integration