Skip to content
This repository was archived by the owner on Oct 25, 2018. It is now read-only.

Commit 755adcd

Browse files
author
Giuseppe Morelli
committed
Merge branch 'release/1.2.1'
2 parents 5ff3c2c + 44339d3 commit 755adcd

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

BOXES.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,9 @@
145145

146146
-----
147147

148-
## 1.0.1
148+
## 1.0.1 - deprecated
149+
150+
(not available anymore)
149151

150152
**OS**: debian/jessie 8.5.1 64bit
151153

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
Follow guideline of [Keep a Changelog](http://keepachangelog.com) from 1.11.5
44

5+
## [1.2.1]
6+
7+
### Changed
8+
- fix config file
9+
510
## [1.2.0]
611

712
### Added

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
[![stable version](https://img.shields.io/badge/stable%20version-1.2.0-green.svg?style=flat-square)](https://github.com/gmdotnet/vagrant-multi-machine-virtualbox/releases/tag/1.2.0)
1+
[![stable version](https://img.shields.io/badge/stable%20version-1.2.1-green.svg?style=flat-square)](https://github.com/gmdotnet/vagrant-multi-machine-virtualbox/releases/tag/1.2.1)
22
[![develop](https://img.shields.io/badge/beta%20version-branch%20develop-oran.svg?style=flat-square)](https://github.com/gmdotnet/vagrant-multi-machine-virtualbox/tree/develop)
33
[![license](https://img.shields.io/badge/license-OSL--3-blue.svg?style=flat-square)](https://github.com/gmdotnet/vagrant-multi-machine-virtualbox/blob/master/LICENSE.txt)
4-
[![gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg)](https://gitter.im/GMdotnet/Lobby?utm_source=share-link&utm_medium=link&utm_campaign=share-link)
54

65
# Vagrant Multi Machine Virtualbox
76

@@ -103,4 +102,4 @@ Tab indent: 4 spaces or tab
103102
Any contribution is highly appreciated. The best way to contribute code is to open a [pull request on GitHub](https://help.github.com/articles/using-pull-requests).<br />Please create your pull request against the `develop` branch
104103

105104
### Credits
106-
Giuseppe Morelli - [giuseppemorelli.net](http://www.giuseppemorelli.net)
105+
Giuseppe Morelli - [giuseppemorelli.net](https://giuseppemorelli.net)

config/config.yaml.sample

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
## ##
33
## GMdotnet ##
44
## Vagrant Multi Machine Virtualbox ##
5-
## Version 1.2.0 ##
5+
## Version 1.2.1 ##
66
## ##
77
## Config file ##
88
#######################################
@@ -21,7 +21,7 @@ gmdotnet:
2121
ram: 1024
2222
cpu: 1
2323
extra_hard_disk:
24-
create: yes
24+
create: no
2525
filepath: .vagrant/extradisk.vdi
2626
size: 30 # size in GB
2727
# PROVISION
@@ -66,7 +66,7 @@ gmdotnet:
6666
# - "-v"
6767
# - "-z"
6868
# - "--delete"
69-
# exclude:
69+
# exclude:
7070
# - ""
7171
# - folder:
7272
# host_folder: /mnt/extra/rsync2

0 commit comments

Comments
 (0)