diff --git a/aegir-release.make b/aegir-release.make index e004c4b774a074536d854a977cca12d5e8570cfb..8ad05b849dde5b03e226401f64f2f1600c08cd8c 100644 --- a/aegir-release.make +++ b/aegir-release.make @@ -4,4 +4,4 @@ api = 2 ; this makefile fetches the latest release from Drupal.org ; it is maintained through the release.sh script projects[hostmaster][type] = "core" -projects[hostmaster][version] = "7.x-3.0-dev" +projects[hostmaster][version] = "7.x-3.0-rc3" diff --git a/aegir.make b/aegir.make deleted file mode 100644 index d1357cc84ef36ce883a105d1a5d6da21cc190ab1..0000000000000000000000000000000000000000 --- a/aegir.make +++ /dev/null @@ -1,10 +0,0 @@ -core = 7.x -api = 2 - -projects[drupal][type] = "core" - -projects[hostmaster][type] = "profile" -projects[hostmaster][download][type] = "git" -projects[hostmaster][download][url] = "http://git.drupal.org/project/hostmaster.git" -projects[hostmaster][download][branch] = "7.x-3.x" - diff --git a/aegir.make b/aegir.make new file mode 120000 index 0000000000000000000000000000000000000000..f6e35b975feae015d21a03f4812e212d0079b010 --- /dev/null +++ b/aegir.make @@ -0,0 +1 @@ +aegir-release.make \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 126bed00f07ceaa787d0781e5aee25aeca625013..f5f021e5c006030fb8c7fc13d67232c05e3c81f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,15 @@ +aegir3-provision (3.0~rc3) unstable; urgency=medium + + * Third release candidate of the 3.x branch. + * Revert back to Drush 6 for now. + + -- Herman van Rink Sun, 19 Jul 2015 20:56:53 +0200 + aegir3-provision (3.0~rc2) unstable; urgency=medium * Second release candidate of the 3.x branch. - -- Herman van Rink Sun, 19 Jul 2015 20:37:22 +0200 + -- Herman van Rink Sun, 19 Jul 2015 20:37:22 +0200 aegir3-provision (3.0~rc1) unstable; urgency=medium diff --git a/provision.info b/provision.info index 6f0191608fab3199092e85ac1c82308fcadba9a7..b8e946b0481b2142052a25b370238515d6121502 100644 --- a/provision.info +++ b/provision.info @@ -1,4 +1,4 @@ name=Provision description="Aegir backend" -version=7.x-3.x +version=7.x-3.0-rc3 diff --git a/upgrade.sh.txt b/upgrade.sh.txt index 44dfa82828d40a101126287b0297c3c5fce11e77..be48be73a56a625f62b290e74a2c1baf20e2e607 100644 --- a/upgrade.sh.txt +++ b/upgrade.sh.txt @@ -9,7 +9,7 @@ ######################################################################## # Basic variables, change before running. -AEGIR_VERSION="7.x-3.x" +AEGIR_VERSION="7.x-3.0-rc3" NEW_DRUSH_VERSION=6.6.0 # Extra variables, no changes needed for most use-cases.