Merge branch 'main' into 'documentation'
# Conflicts: # README.md
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 44 additions, 5 deletions.gitlab-ci.yml
- CONTRIBUTING.md 1 addition, 1 deletionCONTRIBUTING.md
- Dockerfile 8 additions, 7 deletionsDockerfile
- build.gradle 1 addition, 1 deletionbuild.gradle
- code.json 6 additions, 6 deletionscode.json
- etc/matlab/gmmBatchExample.m 2 additions, 2 deletionsetc/matlab/gmmBatchExample.m
- etc/python/gmmBatchExample.py 2 additions, 2 deletionsetc/python/gmmBatchExample.py
- gradle.properties 1 addition, 1 deletiongradle.properties
- gradle/ext.gradle 1 addition, 1 deletiongradle/ext.gradle
- scripts/docker-config.inc.sh 1 addition, 1 deletionscripts/docker-config.inc.sh
- settings.gradle 1 addition, 1 deletionsettings.gradle
- src/main/java/gov/usgs/earthquake/nshmp/DeaggEpsilon.java 1 addition, 1 deletionsrc/main/java/gov/usgs/earthquake/nshmp/DeaggEpsilon.java
- src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java 3 additions, 3 deletionssrc/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java
- src/main/java/gov/usgs/earthquake/nshmp/www/ContextPathCookie.java 0 additions, 39 deletions...java/gov/usgs/earthquake/nshmp/www/ContextPathCookie.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 deletionssrc/main/resources/application.yml
- src/main/resources/swagger/index.html 2 additions, 2 deletionssrc/main/resources/swagger/index.html
- src/main/resources/swagger/index.js 26 additions, 12 deletionssrc/main/resources/swagger/index.js
- ws.Dockerfile 14 additions, 25 deletionsws.Dockerfile
Loading
Please register or sign in to comment