Skip to content

Commit

Permalink
Merge branch 'hotfix/0.4.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
David King committed Nov 19, 2012
2 parents dc78441 + a624c8c commit 1059b3b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
@@ -1,6 +1,10 @@
vagrant-drupal changelog vagrant-drupal changelog
======================== ========================


### 0.4.1 (November 19, 2012)

* Use initdb cookbook version 1.0.1

### 0.4.0 (August 14, 2012) ### 0.4.0 (August 14, 2012)


* Use upstream drush cookbook [GH-70] * Use upstream drush cookbook [GH-70]
Expand Down
2 changes: 1 addition & 1 deletion Cheffile
Expand Up @@ -15,7 +15,7 @@ cookbook 'drush',


cookbook 'initdb', cookbook 'initdb',
:git => 'git://github.com/xforty/chef-initdb.git', :git => 'git://github.com/xforty/chef-initdb.git',
:ref => '1.0.0' :ref => '1.0.1'


# Load from xforty repo until known issue is fixed # Load from xforty repo until known issue is fixed
# http://tickets.opscode.com/browse/COOK-932 # http://tickets.opscode.com/browse/COOK-932
Expand Down
10 changes: 5 additions & 5 deletions Cheffile.lock
Expand Up @@ -6,7 +6,7 @@ SITE
aws (0.100.0) aws (0.100.0)
build-essential (1.1.0) build-essential (1.1.0)
chef_handler (1.0.6) chef_handler (1.0.6)
database (1.2.0) database (1.3.2)
aws (>= 0.0.0) aws (>= 0.0.0)
mysql (>= 1.2.0) mysql (>= 1.2.0)
postgresql (>= 0.0.0) postgresql (>= 0.0.0)
Expand Down Expand Up @@ -62,11 +62,11 @@ GIT


GIT GIT
remote: git://github.com/xforty/chef-initdb.git remote: git://github.com/xforty/chef-initdb.git
ref: 1.0.0 ref: 1.0.1
sha: 96914c08904fc345279864ad087c21f00108bce1 sha: d6c22359da1cd6e74f420d0f832357d1b84196aa
specs: specs:
initdb (1.0.0) initdb (1.0.1)
database (>= 0.0.0) database (= 1.3.2)


GIT GIT
remote: git://github.com/xforty/chef-mysql.git remote: git://github.com/xforty/chef-mysql.git
Expand Down
2 changes: 1 addition & 1 deletion README.md
@@ -1,6 +1,6 @@
vagrant-drupal vagrant-drupal
============== ==============
version 0.4.0 - [changelog](https://github.com/xforty/vagrant-drupal/blob/master/CHANGELOG.md) version 0.4.1 - [changelog](https://github.com/xforty/vagrant-drupal/blob/master/CHANGELOG.md)


A project template for building reproducible and portable local Drupal A project template for building reproducible and portable local Drupal
development environments. If you want to learn more about the project, development environments. If you want to learn more about the project,
Expand Down

0 comments on commit 1059b3b

Please sign in to comment.