Merge lp://staging/~ricardokirkner/locolander/fix-deploy into lp://staging/locolander
Proposed by
Ricardo Kirkner
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~ricardokirkner/locolander/fix-deploy |
| Merge into: | lp://staging/locolander |
| Prerequisite: | lp://staging/~ricardokirkner/locolander/django-supervisor |
| Diff against target: |
93 lines (+13/-10) (has conflicts) 4 files modified
docker/scripts/locolander (+4/-0) fabfile.py (+1/-1) locolander/locolanderweb/tasks.py (+5/-5) locolander/supervisord.conf (+3/-4) Text conflict in locolander/locolanderweb/tasks.py |
| To merge this branch: | bzr merge lp://staging/~ricardokirkner/locolander/fix-deploy |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| LocoLanderos | Pending | ||
|
Review via email:
|
|||
Commit message
various fixes for real deployment issues
To post a comment you must log in.
Unmerged revisions
- 37. By Ricardo Kirkner
-
fixes to supervisor config
- 36. By Ricardo Kirkner
-
use proper path to locolander script
- 35. By Ricardo Kirkner
-
avoid bzr diff aborting locolander script
- 34. By Ricardo Kirkner
-
better output from script
- 33. By Ricardo Kirkner
-
replace subprocess with envoy
use envoy instead of subprocess, because the latter fails to run properly
when celeryd is started under supervisor. - 32. By Ricardo Kirkner
-
customized model repr strings
- 31. By Ricardo Kirkner
-
use absolute path for database file
- 30. By Ricardo Kirkner
-
better output handling
- 29. By Ricardo Kirkner
-
disable autoreload
- 28. By Ricardo Kirkner
-
added envoy and django-supervisor as dependencies
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
