summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Beaupré2014-04-23 14:08:38 -0400
committerAntoine Beaupré2014-04-23 14:08:38 -0400
commit12b8adddfad4d31708a5a755c29e3941df496b85 (patch)
tree0b35765e4ad5bc374a86dc8a288583d6f76ea3a6
parent02ef481477acd3306f55c5c06661fddd8879ebe5 (diff)
change version information for release 1.126.x-1.12
-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..63e8ddc 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.12"
diff --git a/debian/changelog b/debian/changelog
index 4b98803..fcee4c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+aegir-provision (1.12) testing; urgency=low
+
+ * modal frame was updated to cover for SA-CONTRIB-2014-012 (#2191827)
+ * the jQuery download URL was fixed
+
+ -- Antoine Beaupré <anarcat@debian.org> Wed, 23 Apr 2014 14:04:20 -0400
+
aegir-provision (1.11) testing; urgency=high
* fix mild security issue with login-reset links (#1220062)
diff --git a/provision.info b/provision.info
index 43567aa..bcce3f6 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.12
diff --git a/upgrade.sh.txt b/upgrade.sh.txt
index afa25d2..2893457 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.12"
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