diff --git a/aegir-release.make b/aegir-release.make index edddaf7c5b93c56e32c5a9df3a90bc14658bbd31..aa99cb6df720d08173b1b6b8635a63850df34ffa 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.0" 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 f8afb436361867aff644f777e3da1fbcb0bedb1a..54fca9e05f89c6e13e47c5329ff4f834a13e6139 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +aegir2-provision (2.0) unstable; urgency=low + + * stable 2.0 release + * significant stability improvements, Drush 5 and 6 support, + subdirectory multisite support, improved nginx support, native views + and more: http://community.aegirproject.org/2.0 + + -- Antoine Beaupré Wed, 08 Jan 2014 15:05:24 -0500 + aegir2-provision (2.0~rc5.1) testing; urgency=low * rebuild package with all makefiles and modules diff --git a/provision.info b/provision.info index a956a2991cc99d8663849f612cc79b4249a81200..d15cce460a44de057cf568c1324810076a675822 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.0 diff --git a/upgrade.sh.txt b/upgrade.sh.txt index 87908c1db13d349c6a45a73ff86d29f3e0c9b5be..150fbc3ae0e6bfd9426223e0321d5c9f6ce312b4 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.0" 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