Merge lp://staging/~michael.nelson/ubuntu-webcatalog/rt-61147-nagios-sca-import-dict-config into lp://staging/ubuntu-webcatalog
Proposed by
Michael Nelson
| Status: | Merged |
|---|---|
| Approved by: | Michael Nelson |
| Approved revision: | 190 |
| Merged at revision: | 186 |
| Proposed branch: | lp://staging/~michael.nelson/ubuntu-webcatalog/rt-61147-nagios-sca-import-dict-config |
| Merge into: | lp://staging/ubuntu-webcatalog |
| Diff against target: |
216 lines (+46/-33) 7 files modified
.bzrignore (+1/-0) django_project/config/main.cfg (+33/-7) src/webcatalog/management/commands/import_exhibits.py (+1/-1) src/webcatalog/management/commands/import_sca_apps.py (+9/-12) src/webcatalog/schema.py (+0/-3) src/webcatalog/templatetags/webcatalog.py (+2/-2) src/webcatalog/wsgi.py (+0/-8) |
| To merge this branch: | bzr merge lp://staging/~michael.nelson/ubuntu-webcatalog/rt-61147-nagios-sca-import-dict-config |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Westby (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Update logging dictConfig for use in deployments and add a specific logger for import_sca_apps.
Description of the change
This is to fix RT 61147 - just to verify the new config (well, ensure that the dev env uses the same setup) which is used in the separate config branch at:
To post a comment you must log in.
Revision history for this message
| James Westby (james-w) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
