Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

aim_control
- Activity
- Members
- Labels
- Releases
- Model registry
- Model experiments

Snippets Groups Projects

5a447404

Commit 5a447404 authored 8 years ago by Andreas Alvarsson

Downloads
- Plain Diff

Merge branch 'production' into 'production'

Merge till Production

See merge request !2

parents ce2f9fe5 53ceacac

No related branches found

No related tags found

1 merge request!2Merge till Production

Pipeline #3721 passed 8 years ago

Stage: external

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
manifests/firewall.pp 7 additions, 0 deletions

manifests/firewall.pp
manifests/init.pp 91 additions, 36 deletions

manifests/init.pp
templates/55-permit-skadereg.rules.erb 15 additions, 0 deletions

templates/55-permit-skadereg.rules.erb
templates/dotenv.erb 8 additions, 0 deletions

templates/dotenv.erb
templates/example.erb 0 additions, 1 deletion

templates/example.erb

with 122 additions and 37 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