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

Admin message

Maintenance scheduled for Thursday, April 10, from 5 PM to 6 PM ET.

b477c40a

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

Downloads
- Plain Diff

Merge branch 'app-work' into 'main'

App work

See merge request !585

parents e71d7c17 e0af6e30

No related branches found

No related tags found

2 merge requests!593Production Release | nshm-haz,!585App work

Pipeline #109380 passed 3 years ago

Stage: build

Stage: trigger

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

gradle.properties 2 additions, 2 deletions

gradle.properties
src/main/java/gov/usgs/earthquake/nshmp/DisaggEpsilon.java 4 additions, 1 deletion

src/main/java/gov/usgs/earthquake/nshmp/DisaggEpsilon.java
src/main/java/gov/usgs/earthquake/nshmp/www/meta/Metadata.java 0 additions, 20 deletions

...ain/java/gov/usgs/earthquake/nshmp/www/meta/Metadata.java
src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService.java 16 additions, 7 deletions

...gov/usgs/earthquake/nshmp/www/services/HazardService.java
src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService2.java 16 additions, 7 deletions

...ov/usgs/earthquake/nshmp/www/services/HazardService2.java
src/main/java/gov/usgs/earthquake/nshmp/www/services/RateService.java 12 additions, 9 deletions

...a/gov/usgs/earthquake/nshmp/www/services/RateService.java
src/main/java/gov/usgs/earthquake/nshmp/www/services/ServicesUtil.java 7 additions, 3 deletions

.../gov/usgs/earthquake/nshmp/www/services/ServicesUtil.java
src/main/java/gov/usgs/earthquake/nshmp/www/services/SourceLogicTreesService.java 13 additions, 4 deletions

...arthquake/nshmp/www/services/SourceLogicTreesService.java
src/main/java/gov/usgs/earthquake/nshmp/www/services/SourceServices.java 9 additions, 6 deletions

...ov/usgs/earthquake/nshmp/www/services/SourceServices.java

with 79 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