summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Gervais2014-04-23 21:09:04 (GMT)
committerChristopher Gervais2014-04-23 21:09:04 (GMT)
commit44cead56a2201c4796455c0152d439d726fc6aa2 (patch)
treea95a49741c45c4751744491212dcff1815c9a1d5
parentd0124016268d98a9d8401be8ced610beb7f20e91 (diff)
change version information for release 2.16.x-2.1
-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..c972a1a 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.1"
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 54fca9e..e909233 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+aegir2-provision (2.1) unstable; urgency=medium
+
+ * This release ships with support for Apache 2.4, along with updates
+ to Drupal core and ModalframeAPI. A number of bug-fixes are included
+ affecting deployment of Drupal 7 sites, aliases with sub-directory
+ installs, backups, and more: http://community.aegirproject.org/2.1
+
+ -- Christopher Gervais <chris@ergonlogic.com> Wed, 23 Apr 2014 17:06:21 -0400
+
aegir2-provision (2.0) unstable; urgency=low
* stable 2.0 release
diff --git a/provision.info b/provision.info
index a956a29..a9c9b7d 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.1
diff --git a/upgrade.sh.txt b/upgrade.sh.txt
index 87908c1..5748cd6 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.1"
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