summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Beaupré2013-11-26 16:44:47 (GMT)
committerAntoine Beaupré2013-11-26 16:44:47 (GMT)
commit3672589d01e90a47b0a6fdd9ba47f88226c67b82 (patch)
treeb5c2501b725e0baab29b522a3b75e96738402e43
parent408448af6517bcee092dd5885d01f392ecf3df27 (diff)
change version information for release 1.116.x-1.11
-rw-r--r--aegir.make2
-rw-r--r--debian/changelog7
-rw-r--r--provision.info2
-rw-r--r--upgrade.sh.txt2
4 files changed, 10 insertions, 3 deletions
diff --git a/aegir.make b/aegir.make
index c988434..3de9e22 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-1.x"
+projects[hostmaster][download][tag] = "6.x-1.11"
diff --git a/debian/changelog b/debian/changelog
index 7810a4c..4b98803 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+aegir-provision (1.11) testing; urgency=high
+
+ * fix mild security issue with login-reset links (#1220062)
+ * security fix: SA-CORE-2013-003, files/ protection (#2141799)
+
+ -- Antoine Beaupré <anarcat@debian.org> Tue, 26 Nov 2013 11:31:55 -0500
+
aegir-provision (1.10) testing; urgency=high
* new release: Security fixes for a moderately critical vulnerability found in
diff --git a/provision.info b/provision.info
index 43567aa..a2150d9 100644
--- a/provision.info
+++ b/provision.info
@@ -1,4 +1,4 @@
name=Provision
description="Aegir backend"
-version=6.x-1.x
+version=6.x-1.11
diff --git a/upgrade.sh.txt b/upgrade.sh.txt
index afa25d2..a45d180 100644
--- a/upgrade.sh.txt
+++ b/upgrade.sh.txt
@@ -15,7 +15,7 @@ msg() {
}
# basic variables, change before running
-AEGIR_VERSION="6.x-1.x"
+AEGIR_VERSION="6.x-1.11"
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