Merge branch 'master' of gitlab.eox.at:vagrant/builder_rpm
Conflicts: Readme.md
Showing
- Readme.md 4 additions, 1 deletionReadme.md
- puppet/modules/buildtools/manifests/init.pp 3 additions, 1 deletionpuppet/modules/buildtools/manifests/init.pp
- puppet/modules/eoxserver/manifests/init.pp 15 additions, 0 deletionspuppet/modules/eoxserver/manifests/init.pp
- puppet/modules/rasdaman/manifests/init.pp 4 additions, 3 deletionspuppet/modules/rasdaman/manifests/init.pp
Loading
Please register or sign in to comment