Permalink
Browse files

Merge branch 'hotfix/0.4.3'

  • Loading branch information...
2 parents 92ff056 + 35f64c1 commit 0d4fd1c8a4fe5d598689754d44bf549c32a7de75 David King committed Jan 11, 2013
Showing with 24 additions and 17 deletions.
  1. +6 −0 CHANGELOG.md
  2. +1 −1 README.md
  3. +17 −16 example.make
View
@@ -1,6 +1,12 @@
vagrant-drupal changelog
========================
+### 0.4.3 (January 10, 2013)
+
+ * Update example.make to match xforty-drupal's distro.make.example
+
+ * Use xforty-drupal 7.x-2.0.0
+
### 0.4.2 (January 9, 2013)
* Update reference to xforty-drupal xforty.make
View
@@ -1,6 +1,6 @@
vagrant-drupal
==============
-version 0.4.2 - [changelog](https://github.com/xforty/vagrant-drupal/blob/master/CHANGELOG.md)
+version 0.4.3 - [changelog](https://github.com/xforty/vagrant-drupal/blob/master/CHANGELOG.md)
A project template for building reproducible and portable local Drupal
development environments. If you want to learn more about the project,
View
@@ -1,54 +1,55 @@
;;
-;; Stub makefile to building xforty-drupal
+;; Stub make file for building xforty-drupal. Copy this file and add
+;; site-specific components for your project.
;;
;----------------------------------------
; base make file
;----------------------------------------
-; If you want to use the latest HEAD from 7.x branch
-;includes[] = http://github.com/xforty/xforty-drupal/raw/7.x/xforty.make
+includes[] = http://github.com/xforty/xforty-drupal/raw/7.x-2.0.0/base.make
+
+;----------------------------------------
+; base make file overrides
+;----------------------------------------
+
-; If you want to use a specific tag instead (recommended)
-includes[] = http://github.com/xforty/xforty-drupal/raw/7.x-1.1.0/xforty.make
;----------------------------------------
-; features
+; distro features
;----------------------------------------
;----------------------------------------
-; libraries
+; distro libraries
;----------------------------------------
;----------------------------------------
-; modules
+; distro modules
;----------------------------------------
;----------------------------------------
-; profiles
+; distro profiles
;----------------------------------------
-; Default behavior is to download the HEAD of the 7.x branch.
-; When creating your own site's distro.make, comment out the
-; download branch line and un-comment out the download tag line.
projects[xforty][type] = profile
projects[xforty][download][type] = git
projects[xforty][download][url] = git://github.com/xforty/xforty-drupal.git
-;projects[xforty][download][branch] = 7.x
-projects[xforty][download][tag] = 7.x-1.1.0
+projects[xforty][download][tag] = 7.x-2.0.0
+
+; <PROJECT_PROFILE_GOES_HERE>
;----------------------------------------
-; themes
+; distro themes
;----------------------------------------
;----------------------------------------
-; Include base make file overrides below
+; distro make file overrides
;----------------------------------------

0 comments on commit 0d4fd1c

Please sign in to comment.