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.

2d3d356b

Commit 2d3d356b authored 4 years ago by Powers, Peter M.

Downloads
- Plain Diff

Merge branch 'issue-447' into 'master'

Fix Resources

Closes #447

See merge request ghsc/nshmp/nshmp-haz-v2!496

parents 96b6332a afe98530

No related branches found

No related tags found

1 merge request!496Fix Resources

Pipeline #19532 passed 4 years ago

Stage: assemble

Stage: test

Stage: publish

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

build.gradle 1 addition, 5 deletions

build.gradle
gradle/jar.gradle 28 additions, 20 deletions

gradle/jar.gradle
gradle/tasks.gradle 0 additions, 7 deletions

gradle/tasks.gradle
scripts/docker-entrypoint.ws.sh 1 addition, 1 deletion

scripts/docker-entrypoint.ws.sh
src/main/java/gov/usgs/earthquake/nshmp/www/SourceController.java 1 addition, 1 deletion

.../java/gov/usgs/earthquake/nshmp/www/SourceController.java
src/main/resources/application.yml 1 addition, 1 deletion

src/main/resources/application.yml
ws.Dockerfile 3 additions, 6 deletions

ws.Dockerfile

with 35 additions and 41 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