Merge lp://qastaging/~dooferlad/linaro-license-protection/django-configs-debug-off into lp://qastaging/~linaro-automation/linaro-license-protection/trunk
Proposed by
James Tunnicliffe
| Status: | Rejected |
|---|---|
| Rejected by: | Данило Шеган |
| Proposed branch: | lp://qastaging/~dooferlad/linaro-license-protection/django-configs-debug-off |
| Merge into: | lp://qastaging/~linaro-automation/linaro-license-protection/trunk |
| Diff against target: |
827 lines (+759/-0) (has conflicts) 13 files modified
README (+213/-0) apache/releases.linaro.org (+39/-0) apache/snapshots.linaro.org (+154/-0) apache/staging.releases.linaro.org (+39/-0) apache/staging.snapshots.linaro.org (+154/-0) django/settings_releases.py (+22/-0) django/settings_snapshots.py (+22/-0) django/settings_staging_releases.py (+20/-0) django/settings_staging_snapshots.py (+20/-0) wsgi/wsgi_releases.py (+19/-0) wsgi/wsgi_snapshots.py (+19/-0) wsgi/wsgi_staging_releases.py (+19/-0) wsgi/wsgi_staging_snapshots.py (+19/-0) Conflict adding file README. Moved existing file to README.moved. |
| To merge this branch: | bzr merge lp://qastaging/~dooferlad/linaro-license-protection/django-configs-debug-off |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Данило Шеган (community) | Disapprove | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Данило Шеган (danilo) wrote | # |
Unmerged revisions
- 19. By James Tunnicliffe
-
Disabled DEBUG for production instances
- 18. By Данило Шеган
-
Move deployment steps for upload framework here as well.
- 17. By Данило Шеган
-
Fallback to "templates" dir for separate sites.
- 16. By Данило Шеган
-
Revert previous change.
- 15. By Данило Шеган
-
Clear-up system path in wsgi file.
- 14. By Данило Шеган
-
Update SSL cert file on snapshots.
linaro. org. - 13. By Данило Шеган
-
Update the SSL statement as well.
- 12. By Данило Шеган
-
Move deployment steps out of the code README and into the configs README.
- 11. By Данило Шеган
-
Set DJANGO_
SETTINGS_ MODULE unconditionally to avoid variable-based flakiness in mod_wsgi (for production configs as well). - 10. By Данило Шеган
-
Set DJANGO_
SETTINGS_ MODULE unconditionally to avoid variable-based flakiness in mod_wsgi.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
You should propose against ~linaro-