Merge lp://staging/~dobey/cupstream2distro-config/multi-coverage into lp://staging/cupstream2distro-config
Proposed by
dobey
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Francis Ginther | ||||
| Approved revision: | 1295 | ||||
| Merged at revision: | 1295 | ||||
| Proposed branch: | lp://staging/~dobey/cupstream2distro-config/multi-coverage | ||||
| Merge into: | lp://staging/cupstream2distro-config | ||||
| Diff against target: |
2305 lines (+339/-339) 64 files modified
ci/jenkins-templates/qt-pbuilder-config.xml.tmpl (+1/-1) stacks/dev/ci.cfg (+2/-2) stacks/dev/click-package.cfg (+1/-1) stacks/dev/qa.cfg (+5/-5) stacks/dev/qt.cfg (+2/-2) stacks/dev/services.cfg (+2/-2) stacks/head/click-package.cfg (+1/-1) stacks/head/hud.cfg (+3/-3) stacks/head/indicators.cfg (+19/-19) stacks/head/mir.cfg (+1/-1) stacks/head/misc.cfg (+2/-2) stacks/head/phone.cfg (+6/-6) stacks/head/qa.cfg (+3/-3) stacks/head/services.cfg (+2/-2) stacks/head/settings.cfg (+3/-3) stacks/head/snappy.cfg (+1/-1) stacks/head/unity.cfg (+3/-3) stacks/head/webcred.cfg (+12/-12) stacks/trusty/apps.cfg (+4/-4) stacks/trusty/hud.cfg (+3/-3) stacks/trusty/indicators.cfg (+19/-19) stacks/trusty/media.cfg (+4/-4) stacks/trusty/mir.cfg (+1/-1) stacks/trusty/misc.cfg (+3/-3) stacks/trusty/phone.cfg (+6/-6) stacks/trusty/platform.cfg (+6/-6) stacks/trusty/qa.cfg (+6/-6) stacks/trusty/sdk.cfg (+7/-7) stacks/trusty/services.cfg (+3/-3) stacks/trusty/unity.cfg (+7/-7) stacks/trusty/webapp.cfg (+3/-3) stacks/trusty/webcred.cfg (+2/-2) stacks/utopic/apps.cfg (+4/-4) stacks/utopic/click-package.cfg (+1/-1) stacks/utopic/hud.cfg (+3/-3) stacks/utopic/indicators.cfg (+23/-23) stacks/utopic/media.cfg (+4/-4) stacks/utopic/mir.cfg (+1/-1) stacks/utopic/misc.cfg (+3/-3) stacks/utopic/phone.cfg (+6/-6) stacks/utopic/platform.cfg (+6/-6) stacks/utopic/qa.cfg (+6/-6) stacks/utopic/sdk.cfg (+7/-7) stacks/utopic/services.cfg (+3/-3) stacks/utopic/settings.cfg (+3/-3) stacks/utopic/unity.cfg (+7/-7) stacks/utopic/webapp.cfg (+3/-3) stacks/utopic/webcred.cfg (+18/-18) stacks/vivid/apps.cfg (+4/-4) stacks/vivid/click-package.cfg (+1/-1) stacks/vivid/hud.cfg (+3/-3) stacks/vivid/indicators.cfg (+21/-21) stacks/vivid/media.cfg (+4/-4) stacks/vivid/mir.cfg (+1/-1) stacks/vivid/misc.cfg (+3/-3) stacks/vivid/phone.cfg (+6/-6) stacks/vivid/platform.cfg (+6/-6) stacks/vivid/qa.cfg (+7/-7) stacks/vivid/sdk.cfg (+7/-7) stacks/vivid/services.cfg (+4/-4) stacks/vivid/settings.cfg (+3/-3) stacks/vivid/unity.cfg (+7/-7) stacks/vivid/webapp.cfg (+3/-3) stacks/vivid/webcred.cfg (+18/-18) |
||||
| To merge this branch: | bzr merge lp://staging/~dobey/cupstream2distro-config/multi-coverage | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Francis Ginther | Approve | ||
| PS Jenkins bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
Handle multiple coverage xml files for reporting.
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:1295
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://