Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

Partition
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

b3fe7739

Commit b3fe7739 authored 3 years ago by Marc Burnie [AWS]

Downloads
- Plain Diff

resolved pom merge conflicts

parents e152b516 1bdb4796

No related branches found

No related tags found

1 merge request!132partition mongo update

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

NOTICE 166 additions, 167 deletions

NOTICE
devops/azure/chart/templates/virtual-service.yaml 3 additions, 1 deletion

devops/azure/chart/templates/virtual-service.yaml
partition-core/pom.xml 0 additions, 7 deletions

partition-core/pom.xml
pom.xml 1 addition, 1 deletion

pom.xml
provider/partition-aws/src/main/java/org/opengroup/osdu/partition/provider/aws/util/MongoConfig.java 0 additions, 1 deletion

...engroup/osdu/partition/provider/aws/util/MongoConfig.java
provider/partition-aws/src/main/resources/application.properties 1 addition, 1 deletion

...r/partition-aws/src/main/resources/application.properties
provider/partition-azure/pom.xml 1 addition, 19 deletions

provider/partition-azure/pom.xml
provider/partition-gcp/cloudbuild/Dockerfile.cloudbuild 1 addition, 1 deletion

provider/partition-gcp/cloudbuild/Dockerfile.cloudbuild
provider/partition-ibm/pom.xml 1 addition, 1 deletion

provider/partition-ibm/pom.xml
testing/partition-test-aws/pom.xml 1 addition, 1 deletion

testing/partition-test-aws/pom.xml
testing/partition-test-ibm/pom.xml 1 addition, 1 deletion

testing/partition-test-ibm/pom.xml

with 176 additions and 201 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment