diff --git a/aegir-release.make b/aegir-release.make index edddaf7c5b93c56e32c5a9df3a90bc14658bbd31..c972a1ad3300fa50058644d991577e3e96b86ba2 100644 --- a/aegir-release.make +++ b/aegir-release.make @@ -5,4 +5,4 @@ api = 2 ; it is maintained through the release.sh script projects[hostmaster][type] = "core" projects[hostmaster][patch][] = "http://drupal.org/files/common.inc_6.28.patch" -projects[hostmaster][version] = "6.x-2.0-dev" +projects[hostmaster][version] = "6.x-2.1" diff --git a/aegir.make b/aegir.make index 4292e826d23d7e327e840e629972ce996c3c453a..f6e35b975feae015d21a03f4812e212d0079b010 120000 --- a/aegir.make +++ b/aegir.make @@ -1 +1 @@ -aegir-dev.make \ No newline at end of file +aegir-release.make \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 54fca9e05f89c6e13e47c5329ff4f834a13e6139..e909233cc85195de26d2d763f40df18d42a7f32e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +aegir2-provision (2.1) unstable; urgency=medium + + * This release ships with support for Apache 2.4, along with updates + to Drupal core and ModalframeAPI. A number of bug-fixes are included + affecting deployment of Drupal 7 sites, aliases with sub-directory + installs, backups, and more: http://community.aegirproject.org/2.1 + + -- Christopher Gervais Wed, 23 Apr 2014 17:06:21 -0400 + aegir2-provision (2.0) unstable; urgency=low * stable 2.0 release diff --git a/provision.info b/provision.info index a956a2991cc99d8663849f612cc79b4249a81200..a9c9b7dcbfd4f36012045b1c2078db4fde520a6e 100644 --- a/provision.info +++ b/provision.info @@ -1,4 +1,4 @@ name=Provision description="Aegir backend" -version=6.x-2.x +version=6.x-2.1 diff --git a/upgrade.sh.txt b/upgrade.sh.txt index 87908c1db13d349c6a45a73ff86d29f3e0c9b5be..5748cd66b31f44c0164b90f7806e9ac15d71c9e5 100644 --- a/upgrade.sh.txt +++ b/upgrade.sh.txt @@ -13,7 +13,7 @@ msg() { } # basic variables, change before running -AEGIR_VERSION="6.x-2.x" +AEGIR_VERSION="6.x-2.1" DRUSH_DIR=$HOME/drush DRUSH=$DRUSH_DIR/drush.php if which drush 2> /dev/null > /dev/null && which drush | grep -v 'no drush in' > /dev/null; then