Skip to content
Snippets Groups Projects
Commit b4cebedf authored by Riabokon Stanislav(EPAM)[GCP]'s avatar Riabokon Stanislav(EPAM)[GCP]
Browse files

Merge remote-tracking branch 'origin/master' into integration-master 

# Conflicts:
#	indexer-core/src/main/java/org/opengroup/osdu/indexer/api/CleanupIndiciesApi.java
#	indexer-core/src/test/java/org/opengroup/osdu/indexer/api/CleanupIndiciesApiTest.java
#	provider/indexer-gcp/src/main/appengine/app.yaml
#	provider/indexer-gcp/src/main/resources/application.properties
parents ef972b29 28ec85c7
No related branches found
No related tags found
1 merge request!46GCP fix swagger (GONRG-1022)
Pipeline #13220 passed
Stage: review
Stage: build
Stage: containerize
Stage: scan
Stage: deploy
Stage: integration
Stage: attribution
Hide whitespace changes
Inline Side-by-side
Showing
with 491 additions and 103 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment