Merge branch 'master' into grb-helm (891abe5f) · Commits · cspp_geo / geosphere / geosphere-mapserver · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

geosphere-mapserver
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

891abe5f

Commit 891abe5f authored 4 years ago by David Hoese

Downloads
- Plain Diff

Merge branch 'master' into grb-helm

# Conflicts:
#	cspp_geo_geo2grid/run.sh

parents 625b3e4d 10898db6

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

mapserver/Dockerfile 3 additions, 1 deletion

mapserver/Dockerfile
mapserver/abi_l1b_template.map 55 additions, 0 deletions

mapserver/abi_l1b_template.map
mapserver/mapfiles/g16_abi_radf_l1b.map 0 additions, 113 deletions

mapserver/mapfiles/g16_abi_radf_l1b.map
mapserver/mapfiles/output_formats.map 2 additions, 2 deletions

mapserver/mapfiles/output_formats.map
mapserver/mapfiles/overlays.map 1 addition, 1 deletion

mapserver/mapfiles/overlays.map
mapserver/render.py 82 additions, 0 deletions

mapserver/render.py
mapserver/run.sh 14 additions, 0 deletions

mapserver/run.sh

with 157 additions and 117 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