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

c4909e85

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

Downloads
- Plain Diff

Merge branch 'disagg-export-499' into 'main'

Disagg service export additions

Closes #500 and #499

See merge request !590

parents aeca5243 7165c20b

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 6
Pipelines 2

Hide whitespace changes

Inline Side-by-side

Showing

gradle.properties 1 addition, 1 deletion

gradle.properties
src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java 24 additions, 28 deletions

src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java
src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java 18 additions, 10 deletions

...ov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggService.java 42 additions, 10 deletions

...a/gov/usgs/earthquake/nshmp/www/hazard/DisaggService.java
src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardController.java 4 additions, 6 deletions

...ov/usgs/earthquake/nshmp/www/hazard/HazardController.java
src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardService.java 39 additions, 4 deletions

...a/gov/usgs/earthquake/nshmp/www/hazard/HazardService.java

with 128 additions and 59 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