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

Merge branch 'integration-master' of... 

Merge branch 'integration-master' of git.epam.com:go3-nrg/platform/System/partition into integration-master

# Conflicts:
#	partition-core/src/main/java/org/opengroup/osdu/partition/logging/AuditLogger.java
#	partition-core/src/test/java/org/opengroup/osdu/partition/logging/AuditLoggerTest.java
#	provider/partition-gcp/src/main/java/org/opengroup/osdu/partition/provider/gcp/security/AuthorizationService.java
parents d79150d7 7fe66c11
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 78 additions and 23 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