summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Beaupré2013-05-16 23:20:19 (GMT)
committerAntoine Beaupré2013-05-16 23:20:19 (GMT)
commit2537caf087e741da08628b236840c5b7707d7fcb (patch)
tree3b0b458ef15fc8b82b848291c8f542d509f315fa
parentf49e0717417409af5303b7690a26f43979d1e639 (diff)
change version information for release 2.0-alpha26.x-2.0-alpha2
-rw-r--r--aegir.make2
-rw-r--r--debian/changelog17
-rw-r--r--provision.info2
-rw-r--r--upgrade.sh.txt2
4 files changed, 17 insertions, 6 deletions
diff --git a/aegir.make b/aegir.make
index f0a70a3..ce5454f 100644
--- a/aegir.make
+++ b/aegir.make
@@ -6,4 +6,4 @@ 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] = "6.x-2.x"
+projects[hostmaster][download][tag] = "6.x-2.0-alpha2"
diff --git a/debian/changelog b/debian/changelog
index 62a6573..fdd6c8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,19 @@
aegir-provision2 (2.0~alpha2) unstable; urgency=low
- * test release scripts
-
- -- Antoine Beaupré <anarcat@debian.org> Thu, 16 May 2013 17:58:07 -0400
+ * This release features improvements to the IP management mechanisms that
+ were broken in the last alpha1 release. We now manage IP addresses
+ individually, and check if an IP is in use before allowing it to be
+ deleted.
+
+ * We also finally leave the files alone on spokes in the multi-server
+ model, a long-standing bug in the 1.x series that led to data loss. A
+ lot of work was done to standardize the Nginx configuration to allow
+ for simpler, yet optional, configurations that leave the admin in
+ charge of choosing the optimisation methods. This is still work in
+ progress, tracked in #1635596: nginx: do not decide the policy for
+ users.
+
+ -- Antoine Beaupré <anarcat@debian.org> Thu, 16 May 2013 19:13:17 -0400
aegir-provision2 (2.0~alpha1) unstable; urgency=low
diff --git a/provision.info b/provision.info
index a956a29..4522b36 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-alpha2
diff --git a/upgrade.sh.txt b/upgrade.sh.txt
index e4ca260..48e059c 100644
--- a/upgrade.sh.txt
+++ b/upgrade.sh.txt
@@ -15,7 +15,7 @@ msg() {
}
# basic variables, change before running
-AEGIR_VERSION="6.x-2.x"
+AEGIR_VERSION="6.x-2.0-alpha2"
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