Merge branch 'master' into '75-update-testing' (1abef6ee) · Commits · MUNI-KYPO-CSC / cyber-sandbox-creator · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

cyber-sandbox-creator
- Activity
- Members
- Labels
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

1abef6ee

Commit 1abef6ee authored 3 years ago by Attila Farkas

Downloads
- Plain Diff

Merge branch 'master' into '75-update-testing'

# Conflicts:
#   topologies/0-routers-1-network-5-hosts.yml

parents a01a76a9 b3f69eea

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

conf/virtualbox_mapping.yml 2 additions, 0 deletions

conf/virtualbox_mapping.yml
modules/preprocessing.py 14 additions, 0 deletions

modules/preprocessing.py
modules/vagrant_generator.py 6 additions, 1 deletion

modules/vagrant_generator.py
templates/vagrantfile 2 additions, 0 deletions

templates/vagrantfile
topologies/2-routers-4-networks-4-hosts.yml 1 addition, 1 deletion

topologies/2-routers-4-networks-4-hosts.yml
topology.yml 2 additions, 4 deletions

topology.yml

with 27 additions and 6 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