Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

N

nshmp-haz
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

2bbd776b

Commit 2bbd776b authored 3 years ago by Clayton, Brandon Scott

Downloads
- Plain Diff

Merge branch 'disagg' into 'main'

Disagg

See merge request !594

parents 3311981c 973e4059

No related branches found

No related tags found

2 merge requests!595Production Release | nshmp-haz,!594Disagg

Pipeline #113870 passed with warnings 3 years ago

Stage: build

Stage: trigger

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

settings.gradle 3 additions, 6 deletions

settings.gradle
src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java 0 additions, 3 deletions

src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java
src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java 6 additions, 2 deletions

...ov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
src/main/resources/application.yml 1 addition, 2 deletions

src/main/resources/application.yml

with 10 additions and 13 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