summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Gervais2013-07-20 19:35:55 (GMT)
committerChristopher Gervais2013-07-20 19:35:55 (GMT)
commit65b25496edee88e35d566555cfe92aaa3daacb56 (patch)
tree521b9df94a095394803574128fc05014667fde1f
parent3d3a8f364aab623bc3b2926963bd473bc2e0398d (diff)
change version information for release 2.0-rc2
-rw-r--r--aegir.make2
-rw-r--r--debian/changelog10
-rw-r--r--provision.info2
-rw-r--r--upgrade.sh.txt2
4 files changed, 13 insertions, 3 deletions
diff --git a/aegir.make b/aegir.make
index f0a70a3..2b6b525 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-rc2"
diff --git a/debian/changelog b/debian/changelog
index a4a49b2..7214d51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+aegir-provision2 (2.0~rc2) unstable; urgency=low
+
+ * This release mainly fixes an error during the rc1 release, which had not
+ been properly updated to pull in the latest tagged code.
+ * A small fix to SSL handling, and updates to external dependencies are
+ the only other changes since rc1.
+ * Full release notes at http://community.aegirproject.org/2.0-rc2
+
+ -- Christopher Gervais <chris@ergonlogic.com> Sat, 20 Jul 2013 15:32:46 -0400
+
aegir-provision2 (2.0~rc1) unstable; urgency=low
* This release mainly targets a few critical bugs that were found in the
diff --git a/provision.info b/provision.info
index a956a29..fef031b 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-rc2
diff --git a/upgrade.sh.txt b/upgrade.sh.txt
index 6bd9036..b3a8ad8 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-rc2"
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