For people with a 'git pp' alias to push to production. This are the
aliases I use to push & deploy changes to production:
prod = "!git checkout production && git fetch origin production && gitk --all"
ff = "merge --ff-only"
pp = "!git push && if [ -e deploy.sh ]; then ./deploy.sh; fi && git checkout master"
Those are handy to make branch switches easy, and to ensure that you don't
accidentally continue work on the production branch after deploying.
Refactor of pillar-server and pillar-web into a single python package. This
simplifies the overall architecture of pillar applications.
Special thanks @sybren and @venomgfx
