Merge lp:~ted/indicator-sound/mega-merge into lp:indicator-sound/15.04
Proposed by
Ted Gould
Status: | Merged | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | Charles Kerr | ||||||||||||||||||||
Approved revision: | 469 | ||||||||||||||||||||
Merged at revision: | 461 | ||||||||||||||||||||
Proposed branch: | lp:~ted/indicator-sound/mega-merge | ||||||||||||||||||||
Merge into: | lp:indicator-sound/15.04 | ||||||||||||||||||||
Diff against target: |
442 lines (+268/-9) 5 files modified
debian/changelog (+13/-0) src/service.vala (+21/-2) src/sound-menu.vala (+39/-1) src/volume-control.vala (+96/-6) tests/manual (+99/-0) |
||||||||||||||||||||
To merge this branch: | bzr merge lp:~ted/indicator-sound/mega-merge | ||||||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Charles Kerr (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Ted Gould | Pending | ||
Review via email: mp+240751@code.launchpad.net |
This proposal supersedes a proposal from 2014-11-05.
Commit message
Manually merging branches to resolve conflicts
To post a comment you must log in.
FAILED: Continuous integration, rev:467 jenkins. qa.ubuntu. com/job/ indicator- sound-ci/ 172/ jenkins. qa.ubuntu. com/job/ indicator- sound-utopic- amd64-ci/ 39/console jenkins. qa.ubuntu. com/job/ indicator- sound-utopic- armhf-ci/ 39/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/indicator- sound-ci/ 172/rebuild
http://