From 63c97dfd1c0931f324dbcca49872ffc4aec9ef69 Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 30 Jul 2012 11:53:33 -0400 Subject: [PATCH 1/2] Merge in fix from [GH-65] --- Vagrantfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index d8538f5..cb5857c 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -62,8 +62,9 @@ Vagrant::Config.run do |config| chef.log_level = :debug if ENV['vdb'] chef.cookbooks_path = ["cookbooks", "site-cookbooks"] - chef.add_recipe "squid" + # Default top-level chef recipes chef.add_recipe "xforty" + chef.add_recipe "squid" chef.add_recipe "drupal" chef.add_recipe "initdb" From 01226ca4fcc6d62c41adbdc1f636228f2128fb42 Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 31 Jul 2012 11:30:38 -0400 Subject: [PATCH 2/2] Bump version to 0.2.1 and update changelog. --- CHANGELOG.md | 4 ++++ README.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c572184..95485e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ vagrant-drupal changelog ### 0.3.0 (unreleased) +### 0.2.1 (July 31, 2012) + + * Fix error installing squid due to old package name [GH-65] + ### 0.2.0 (May 28, 2012) * Performance improvements for 0.2.0 [GH-43] diff --git a/README.md b/README.md index a04c62c..716a814 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ vagrant-drupal ============== -version 0.2.0 - [changelog](https://github.com/xforty/vagrant-drupal/blob/master/CHANGELOG.md) +version 0.2.1 - [changelog](https://github.com/xforty/vagrant-drupal/blob/master/CHANGELOG.md) Builds a Drupal environment and site on top of a Vagrant vm. This repo can be used as is to get a Drupal site up and running quickly or as a