From 992b429cf5854e79fcdbfbf24ff788bd86379858 Mon Sep 17 00:00:00 2001 From: Adrian Rossouw <adrian@developmentseed.org> Date: Thu, 9 Sep 2010 11:49:24 -0400 Subject: [PATCH] Revert "change version information for release 0.4-alpha13, from 0.4-alpha12" This reverts commit e1c74445c1fd884be7aea8a9e61bc67051b5b582. --- aegir.make | 6 +++--- docs/INSTALL.txt | 2 +- docs/UPGRADE.txt | 4 ++-- install.sh.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/aegir.make b/aegir.make index 474b9b575..be947a648 100644 --- a/aegir.make +++ b/aegir.make @@ -2,6 +2,6 @@ core = 6.x projects[] = "drupal" projects[hostmaster][type] = "profile" -projects[hostmaster][download][type] = "get" -projects[hostmaster][download][url] = "http://files.aegirproject.org/hostmaster-0.4-alpha13.tgz" -projects[hostmaster][download][directory_name] = "hostmaster" +projects[hostmaster][download][type] = "git" +projects[hostmaster][download][url] = "git://git.aegirproject.org/hostmaster.git" +projects[hostmaster][download][branch] = "master" diff --git a/docs/INSTALL.txt b/docs/INSTALL.txt index 15f2dc5ea..b9786cfee 100644 --- a/docs/INSTALL.txt +++ b/docs/INSTALL.txt @@ -250,7 +250,7 @@ as the aegir user created above. This file is available in Provision or can be downloaded through the web with this command:: Shell commands:: - wget -O install.sh.txt 'http://git.aegirproject.org/?p=provision.git;a=blob_plain;f=install.sh.txt;hb=provision-0.4-alpha13' + wget -O install.sh.txt 'http://git.aegirproject.org/?p=provision.git;a=blob_plain;f=install.sh.txt;hb=HEAD' By default, the install script will install the "correct" version of Aegir (ie. if it was downloaded through git, it will install the version from the diff --git a/docs/UPGRADE.txt b/docs/UPGRADE.txt index 9d35aa0ea..b802dee5e 100644 --- a/docs/UPGRADE.txt +++ b/docs/UPGRADE.txt @@ -35,13 +35,13 @@ you are reading this document. Shell commands:: - export AEGIR_VERSION=0.4-alpha13 + export AEGIR_VERSION=HEAD export AEGIR_DIR=/var/aegir export DRUPAL_DIR=$AEGIR_DIR/hostmaster-$AEGIR_VERSION export DRUSH_VERSION=6.x-3.3 export DRUSH_MAKE_VERSION=6.x-2.0-beta8 export AEGIR_DOMAIN=aegir.example.com - export OLD_DRUPAL_DIR=$AEGIR_DIR/hostmaster-0.4-alpha12 + export OLD_DRUPAL_DIR=$AEGIR_DIR/hostmaster-0.4-alpha9 This document also assumes drush is installed properly and we use an environment variable to simplify the documentation again. diff --git a/install.sh.txt b/install.sh.txt index 70a614c8a..50fb52cab 100644 --- a/install.sh.txt +++ b/install.sh.txt @@ -30,7 +30,7 @@ # ######################################################################## # basic variables, change before release -AEGIR_VERSION="0.4-alpha13" +AEGIR_VERSION="HEAD" DRUSH_VERSION=6.x-3.3 # when adding a variable here, add it to the display below -- GitLab