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

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

# Conflicts:
#	partition-core/src/main/java/org/opengroup/osdu/partition/api/PartitionApi.java
#	partition-core/src/main/java/org/opengroup/osdu/partition/logging/AuditEvents.java
#	partition-core/src/main/java/org/opengroup/osdu/partition/logging/AuditLogger.java
#	provider/partition-gcp/src/main/java/org/opengroup/osdu/partition/provider/gcp/service/PartitionServiceImpl.java
parents cec39278 49d8103a
No related branches found
No related tags found
2 merge requests!47Authentication for PartitionService to work under SA(GONRG-1843),!45(GONRG-2074) GCP incorrect response
Hide whitespace changes
Inline Side-by-side
Showing
with 177 additions and 25 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