EOX GitLab Instance

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Builder
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

583f0b8a

Commit 583f0b8a authored 12 years ago by Marko Locher

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/add_stages'

Conflicts:
	puppet/modules/rasdaman/manifests/init.pp

parents 76474719 2ba3bf55

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

puppet/manifests/rpmbuild.pp 6 additions, 2 deletions

puppet/manifests/rpmbuild.pp
puppet/modules/buildtools/manifests/init.pp 4 additions, 1 deletion

puppet/modules/buildtools/manifests/init.pp
puppet/modules/mapserver/manifests/init.pp 28 additions, 28 deletions

puppet/modules/mapserver/manifests/init.pp
puppet/modules/rasdaman/manifests/init.pp 15 additions, 15 deletions

puppet/modules/rasdaman/manifests/init.pp

with 53 additions and 46 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