diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d9500e7078..116acc8edc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Changed + - Verified compatibility with Vagrant 2.x and loosened Vagrant version requirement - Config option 'php_version' should now be used for PHP version selection instead of 'use_php7' - Upgraded Varnish to v4.1 - Improved Magento re-installation speed by avoiding unnecessary cache cleaning diff --git a/README.md b/README.md index 86ae58a0ab6..02313708489 100755 --- a/README.md +++ b/README.md @@ -107,12 +107,6 @@ The software listed below should be available in [PATH](https://en.wikipedia.org bash init_project.sh ``` - :information_source: If you get the following error you may need to change the minimum Vagrant compatibility at the top of your `/Vagrantfile` from `Vagrant.require_version "~> 1.8"` to `Vagrant.require_version ">= 1.8"`. - - ``` - Directory ‘e/magento2/vagrant-magento/etc’ was not mounted as expected by Vagrant. Please make sure ... - ``` - 1. Use the `vagrant-magento` directory as the project root in PHP Storm (not `vagrant-magento/magento2ce`). This is important, because in this case PHP Storm will be configured automatically by [init_project.sh](init_project.sh). If NFS files sync is disabled in [config](etc/config.yaml.dist) and ![](docs/images/windows-icon.png)on Windows hosts [verify the deployment configuration in PHP Storm](docs/phpstorm-configuration-windows-hosts.md). Use the URL for accessing your Magento storefront in the browser as your Web server root URL. Typically this is the localhost, which refers to your development machine. Depending on how you've set up your VM you may also need a port number, like `hhtp://localhost:8080`. diff --git a/Vagrantfile b/Vagrantfile index 077b6546798..b293d9c8d40 100755 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,7 +1,7 @@ # -*- mode: ruby -*- # vi: set ft=ruby : -Vagrant.require_version "> 1.8" +Vagrant.require_version ">= 1.8" require 'yaml'