Skip to content

Commit c83b9d7

Browse files
author
Dominik Schneider
committed
Merge branch 'master' into 'master'
Master See merge request !7
2 parents 8d6fa05 + e543ec3 commit c83b9d7

File tree

814 files changed

+776
-2413
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

814 files changed

+776
-2413
lines changed

README.md

Lines changed: 20 additions & 11 deletions

Vagrantfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
# vi: set ft=ruby :
33

44
Vagrant.configure("2") do |config|
5-
config.vm.box = "ubuntu/xenial64"
5+
config.vm.box = "ubuntu/artful64"
66

77
config.vm.provider "virtualbox" do |vb|
8-
vb.memory = "1024"
8+
vb.memory = "4096"
9+
vb.cpus = 4
910
end
1011

1112
config.vm.provision "shell", inline: <<-SHELL
@@ -20,5 +21,6 @@ Vagrant.configure("2") do |config|
2021
pip3 install docker-compose
2122
systemctl daemon-reload
2223
systemctl restart docker
24+
apt install -y qemu
2325
SHELL
2426
end

bin/linux/aarch64/ncat-fcac8c6

Lines changed: 0 additions & 3 deletions
This file was deleted.

bin/linux/aarch64/nmap-fcac8c6

Lines changed: 0 additions & 3 deletions
This file was deleted.

bin/linux/aarch64/nping-fcac8c6

Lines changed: 0 additions & 3 deletions
This file was deleted.

bin/linux/armhf/ncat-fcac8c6

Lines changed: 0 additions & 3 deletions
This file was deleted.

bin/linux/armhf/nmap-fcac8c6

Lines changed: 0 additions & 3 deletions
This file was deleted.

bin/linux/armhf/nping-fcac8c6

Lines changed: 0 additions & 3 deletions
This file was deleted.

bin/linux/x86/ncat-7.60SVN-3708259

Lines changed: 0 additions & 3 deletions
This file was deleted.

bin/linux/x86/nmap-7.60SVN-3708259

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)