Merge branch 'master' of ssh://git.ahoskingit.com:9022/ahoskingit/orchestration.vagrants
This commit is contained in:
commit
e80698b810
@ -1,14 +1,8 @@
|
||||
---
|
||||
vagrants:
|
||||
"ubuntu/trusty64": "ubuntu/trusty64"
|
||||
<<<<<<< HEAD
|
||||
"ubuntu/xenial64": "ubuntu/xenial64"
|
||||
"boxcutter/ubuntu1604": "boxcutter/ubuntu1604"
|
||||
|
||||
=======
|
||||
"boxcutter/ubuntu1604": "boxcutter/ubuntu1604"
|
||||
|
||||
>>>>>>> dfcfe37cf523476c0bd27c2a0d6e75ab9189654d
|
||||
hosts:
|
||||
docker: 10.200.200.20
|
||||
nextcloud: 10.200.200.2
|
||||
|
Loading…
Reference in New Issue
Block a user