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

d6a4e7a2

Commit d6a4e7a2 authored 4 months ago by Clayton, Brandon Scott

Downloads
- Plain Diff

Merge branch 'site' into 'main'

Site

See merge request !800

parents d8acf281 640aa899

No related branches found

No related tags found

1 merge request!800Site

Pipeline #510044 passed 4 months ago

Stage: build

Stage: test

Stage: trigger

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java 0 additions, 14 deletions

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

...a/gov/usgs/earthquake/nshmp/www/hazard/DisaggService.java
src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardService.java 3 additions, 1 deletion

...a/gov/usgs/earthquake/nshmp/www/hazard/HazardService.java
src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java 5 additions, 13 deletions

...t/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java

with 12 additions and 30 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