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

7f6d4c4f

Commit 7f6d4c4f authored 2 years ago by Clayton, Brandon Scott

Downloads
- Plain Diff

Merge branch 'main' into 'production'

Production Release | nshmp-haz

See merge request !687

parents 5e10b109 d23acfe6

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

docs/pages/Calculation-Configuration.md 18 additions, 13 deletions

docs/pages/Calculation-Configuration.md
gradle.properties 1 addition, 1 deletion

gradle.properties
gradle/nshm.gradle 1 addition, 1 deletion

gradle/nshm.gradle
nshms.yml 2 additions, 2 deletions

nshms.yml
src/main/java/gov/usgs/earthquake/nshmp/www/source/LogicTreesController.java 2 additions, 2 deletions

...sgs/earthquake/nshmp/www/source/LogicTreesController.java
src/main/java/gov/usgs/earthquake/nshmp/www/source/MfdsController.java 131 additions, 0 deletions

.../gov/usgs/earthquake/nshmp/www/source/MfdsController.java
src/main/java/gov/usgs/earthquake/nshmp/www/source/MfdsService.java 107 additions, 0 deletions

...ava/gov/usgs/earthquake/nshmp/www/source/MfdsService.java

with 262 additions and 19 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