Created
May 23, 2013 19:10
-
-
Save jaredlewis/5638627 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| def deploy(): | |
| <<<<<<< HEAD | |
| """ | |
| Deploys new code to servers | |
| """ | |
| execute(__backup__()) | |
| execute(__pull__()) | |
| execute(__install_requirements__()) | |
| execute(syncdb()) | |
| execute(__collectstatic__()) | |
| execute(restart()) | |
| execute(newrelic()) | |
| ======= | |
| execute(__backup__) | |
| execute(__pull__) | |
| execute(__install_requirements__) | |
| execute(syncdb) | |
| execute(collectstatic) | |
| execute(restart) | |
| execute(newrelic) | |
| >>>>>>> 0291239307c4833d09cc04ad76d287700844b333 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment