Merge lp://qastaging/~joetalbott/qa-dashboard/charm_support into lp://qastaging/qa-dashboard
Proposed by
Joe Talbott
Status: | Merged |
---|---|
Approved by: | Joe Talbott |
Approved revision: | 773 |
Merged at revision: | 762 |
Proposed branch: | lp://qastaging/~joetalbott/qa-dashboard/charm_support |
Merge into: | lp://qastaging/qa-dashboard |
Diff against target: |
581 lines (+333/-35) 18 files modified
Makefile (+20/-8) README.install (+2/-0) cm.py (+193/-0) common/tests/test_settings.py (+12/-3) common/utils.py (+2/-2) config-manager.txt (+1/-0) dependencies.txt (+16/-0) manage.py (+3/-0) qa_dashboard/paths.py (+42/-0) qa_dashboard/settings.py (+4/-0) qa_dashboard/settings_base.py (+17/-5) qa_dashboard/settings_devel.py (+6/-0) qa_dashboard/wsgi.py (+3/-0) requirements.txt (+1/-16) scripts/branch-update.py (+3/-0) scripts/ci-dashboard-update.py (+3/-0) smokeng/views.py (+1/-1) tar_excludes.txt (+4/-0) |
To merge this branch: | bzr merge lp://qastaging/~joetalbott/qa-dashboard/charm_support |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Evan (community) | Approve | ||
Review via email:
|
Commit message
Add support needed for the soon to be released CI Dashboard Charm.
Description of the change
Add support needed for the soon to be released CI Dashboard Charm.
To post a comment you must log in.
FAILED: Continuous integration, rev:770 s-jenkins. ubuntu- ci:8080/ job/dashboard- ci/359/
http://
Executed test runs:
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/dashboard- ci/359/ rebuild
http://