Merge lp://staging/~doanac/ubuntu-ci-services-itself/json-jsonp-status into lp://staging/ubuntu-ci-services-itself
Proposed by
Andy Doan
Status: | Merged |
---|---|
Approved by: | Chris Johnston |
Approved revision: | 301 |
Merged at revision: | 299 |
Proposed branch: | lp://staging/~doanac/ubuntu-ci-services-itself/json-jsonp-status |
Merge into: | lp://staging/ubuntu-ci-services-itself |
Diff against target: |
175 lines (+63/-0) 9 files modified
charms/precise/restish/config.yaml (+4/-0) charms/precise/restish/hooks/hooks.py (+13/-0) charms/precise/restish/metadata.yaml (+3/-0) charms/precise/webui/hooks/hooks.py (+35/-0) charms/precise/webui/metadata.yaml (+2/-0) juju-deployer/branch-source-builder.yaml.tmpl (+1/-0) juju-deployer/image-builder.yaml.tmpl (+1/-0) juju-deployer/relations.yaml (+3/-0) juju-deployer/test-runner.yaml.tmpl (+1/-0) |
To merge this branch: | bzr merge lp://staging/~doanac/ubuntu-ci-services-itself/json-jsonp-status |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Andy Doan (community) | Approve | ||
Evan (community) | Approve | ||
Review via email: mp+208915@code.staging.launchpad.net |
Commit message
integrate monitoring api into webui
Provide a simple mechansim for the webui to get monitor the status of other services.
(restish only for this change)
Description of the change
provides the charming logic required to fix:
To post a comment you must log in.
FAILED: Continuous integration, rev:300 s-jenkins. ubuntu- ci:8080/ job/uci- engine- ci/265/
http://
Executed test runs:
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/uci- engine- ci/265/ rebuild
http://