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

Merge branch 'integration-master' into 'master' 

# Conflicts:
#   testing/indexer-test-core/src/main/java/org/opengroup/osdu/common/CleanupIndiciesSteps.java
#   testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/ElasticUtils.java
#   testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/step_definitions/index/cleanup/RunTest.java
#   testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/step_definitions/index/cleanup/Steps.java
parents f2466c1d a9197d01
No related branches found
No related tags found
3 merge requests!72Cloud-agnostic module `indexer-reference` for Anthos (GONRG-1423),!62Gcp sonar fix comments (GONRG-1363),!59GCP rewrite ElascticClientHandlerTest (GONRG-844)
Hide whitespace changes
Inline Side-by-side
Showing
with 211 additions and 89 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