Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

N

nshmp-lib
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

a098acb2

Commit a098acb2 authored 3 years ago by Powers, Peter M.

Downloads
- Plain Diff

Merge branch 'site-work-138' into 'main'

Site defaults cleanup

Closes #138

See merge request !245

parents 38e468c4 e5201098

No related branches found

No related tags found

1 merge request!245Site defaults cleanup

Pipeline #113388 passed 3 years ago

Stage: build

Stage: publish

Stage: trigger

Changes 7
Pipelines 2

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/gov/usgs/earthquake/nshmp/calc/CalcConfig.java 0 additions, 101 deletions

src/main/java/gov/usgs/earthquake/nshmp/calc/CalcConfig.java
src/main/java/gov/usgs/earthquake/nshmp/calc/HazardCalcs.java 2 additions, 2 deletions

...main/java/gov/usgs/earthquake/nshmp/calc/HazardCalcs.java
src/main/java/gov/usgs/earthquake/nshmp/calc/Sites.java 7 additions, 9 deletions

src/main/java/gov/usgs/earthquake/nshmp/calc/Sites.java
src/main/java/gov/usgs/earthquake/nshmp/model/HazardModel.java 11 additions, 10 deletions

...ain/java/gov/usgs/earthquake/nshmp/model/HazardModel.java
src/main/resources/calc/calc-config-defaults.json 0 additions, 9 deletions

src/main/resources/calc/calc-config-defaults.json
src/test/java/gov/usgs/earthquake/nshmp/calc/CalcConfigTests.java 0 additions, 23 deletions

.../java/gov/usgs/earthquake/nshmp/calc/CalcConfigTests.java
src/test/resources/calc/calc-config-extends.json 0 additions, 9 deletions

src/test/resources/calc/calc-config-extends.json

with 20 additions and 163 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