Conflicts:
	aegir.make
	docs/INSTALL.txt
	docs/UPGRADE.txt
	provision.info
	release.sh

try to fix upgrade path from <=0.4-alpha8 by fixing the weight on the hosting module before running the upgrade

we need to do this here because it's too late when deploy calls updatedb, and we don't want to add profile-specific stuff to provision-deploy

because of #955018, setting site_offline doesn't propagate to the context so we need to use a variable already defined, we chose site_enabled

because of #955018, setting site_offline doesn't propagate to the context so we need to use a variable already defined, we chose site_enabled

try to fix upgrade path from <=0.4-alpha8 by fixing the weight on the hosting module before running the upgrade

we need to do this here because it's too late when deploy calls updatedb, and we don't want to add profile-specific stuff to provision-deploy

anarcat authored Feb 17, 2011 and anarcat committed Feb 17, 2011

This reverts commit 464d09557aa52614316cc82f50091af2560e484b.

anarcat authored Feb 17, 2011 and anarcat committed Feb 17, 2011

This wasn't necessary - we don't chown anymore

This reverts commit 2af94443b2452632585042de4d5f32f33112d48a.

anarcat authored Feb 17, 2011 and anarcat committed Feb 17, 2011

I fixed up the comment from the original patch to mark it clearly as needs work (XXX) and possible fixes

mig5 authored Feb 11, 2011 and mig5 committed Feb 11, 2011

Revert "#1016890 reapply contributed patch for fixing infinite loop - the reason it broke under Drush 4 was that I blew away our incorporation of the new cli context"

This reverts commit 0ae46243707c628a2a65dd3f69dac11c59586781.

It is breaking the upgrade path and any Migrate task, and possibly other stuff. See #1056864

Grace authored Feb 03, 2011 and anarcat committed Feb 09, 2011

Re-order locations in the shared Nginx configuration files for better performance and add required in d7 authorize.php to the list of allowed php files. (Grace)