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

85d30068

Commit 85d30068 authored 3 years ago by Clayton, Brandon Scott

Downloads
- Plain Diff

Merge branch 'rename' into 'main'

rename to nshmp-haz

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

parents 96691728 4108ce8d

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 16
Pipelines 3

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 4 additions, 4 deletions

.gitlab-ci.yml
CONTRIBUTING.md 1 addition, 1 deletion

CONTRIBUTING.md
Dockerfile 3 additions, 3 deletions

Dockerfile
README.md 1 addition, 1 deletion

README.md
build.gradle 1 addition, 1 deletion

build.gradle
code.json 6 additions, 6 deletions

code.json
etc/matlab/gmmBatchExample.m 2 additions, 2 deletions

etc/matlab/gmmBatchExample.m
etc/python/gmmBatchExample.py 2 additions, 2 deletions

etc/python/gmmBatchExample.py
gradle/ext.gradle 1 addition, 1 deletion

gradle/ext.gradle
scripts/docker-config.inc.sh 1 addition, 1 deletion

scripts/docker-config.inc.sh
settings.gradle 1 addition, 1 deletion

settings.gradle
src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java 3 additions, 3 deletions

src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java
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 2 additions, 2 deletions

src/main/resources/application.yml
src/main/resources/swagger/index.html 2 additions, 2 deletions

src/main/resources/swagger/index.html
ws.Dockerfile 2 additions, 2 deletions

ws.Dockerfile

with 33 additions and 33 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