Merge branch '6.x-1.x' of git.drupal.org:project/provision into dev-nginx-6.x-1.x

debian/changelog

+aegir-provision (1.8) testing; urgency=low
+
+  * new release: various bugfixes to regressions introduced in 1.7, a few
+    general bug fixes and lots of Nginx fixes.
+
+ -- Steven Jones <steven.jones@computerminds.co.uk>  Wed, 18 Apr 2012 09:34:44 +0100
+
+aegir-provision (1.7) testing; urgency=low
+
+  * new release: various bugfixes that have accumulated in the issue queue
+    since the 1.6 release, including a lot of fixes on Nginx support. We
+    also ship a new clustering module aimed at lightweight slave
+    deployments named the pack module, designed to replace the cluster
+    module which has performance and configuration issues.
+
+ -- Antoine Beaupré <anarcat@debian.org>  Tue, 06 Mar 2012 18:39:37 -0500
+
 aegir-provision (1.6+dev) unstable; urgency=low
 
   * merge in the debian branch to the main 1.x branch, making this a

release.sh

@@ -105,7 +105,12 @@ commitid=`echo $commitmsg | sed 's/^\[[^ ]* \([a-z0-9]*\)\].*$/\1/'`
 sed -n '1,/ --/p' debian/changelog | git tag -a -F - $major-$version
 
 echo reverting tree to HEAD versions
-git revert $commitid
+git revert --no-commit $commitid
+# Unstage the debian/changelog change, as we don't want to revert that.
+git reset --quiet HEAD 'debian/changelog'
+git checkout -- 'debian/changelog'
+git commit
+
 
 if prompt_yes_no "push tags and commits upstream? "; then
     # this makes sure we push the commit *and* the tag