summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Gervais2015-03-25 13:59:20 -0400
committerChristopher Gervais2015-03-25 13:59:20 -0400
commit9b68b04ee25091ba981500ef45997ad7cb29ab69 (patch)
tree54b1f82c3675cbb81ec8b965dd20211361db98e1
parentb321ccdc27b392f0fd3969d4aefdc57075f0500e (diff)
change version information for release 2.26.x-2.2
-rw-r--r--aegir-release.make2
l---------aegir.make2
-rw-r--r--debian/changelog9
-rw-r--r--provision.info2
-rw-r--r--upgrade.sh.txt2
5 files changed, 13 insertions, 4 deletions
diff --git a/aegir-release.make b/aegir-release.make
index edddaf7..8160bf6 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.2"
diff --git a/aegir.make b/aegir.make
index 4292e82..f6e35b9 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 e909233..022d7b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+aegir2-provision (2.2) unstable; urgency=medium
+
+ * This release ships with number of bug fixes, as well as a security fix
+ for nginx users related to the POODLE vulnerability. For more
+ information, see the full release notes:
+ http://community.aegirproject.org/2.2
+
+ -- Christopher Gervais <chris@ergonlogic.com> Wed, 25 Mar 2015 13:57:15 -0400
+
aegir2-provision (2.1) unstable; urgency=medium
* This release ships with support for Apache 2.4, along with updates
diff --git a/provision.info b/provision.info
index a956a29..99370b0 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.2
diff --git a/upgrade.sh.txt b/upgrade.sh.txt
index 87908c1..d7c2015 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.2"
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