The Sound Menu

Merge lp://staging/~xavi-garcia-mena/indicator-sound/sync-vivid-wily into lp://staging/indicator-sound/15.04

  1. sync-vivid-wily
  2. Merge into trunk.15.04
Proposed by Xavi Garcia
Status: Merged
Approved by: Xavi Garcia
Approved revision: 501
Merged at revision: 497
Proposed branch: lp://staging/~xavi-garcia-mena/indicator-sound/sync-vivid-wily
Merge into: lp://staging/indicator-sound/15.04
Diff against target: 1204 lines (+616/-182)
10 files modified
data/com.canonical.indicator.sound.gschema.xml (+63/-0)
debian/changelog (+42/-0)
src/service.vala (+180/-132)
src/volume-control-pulse.vala (+162/-15)
src/volume-control.vala (+13/-1)
tests/CMakeLists.txt (+1/-1)
tests/media-player-user.cc (+138/-22)
tests/notifications-test.cc (+8/-8)
tests/volume-control-mock.vala (+4/-2)
tests/volume-control-test.cc (+5/-1)
To merge this branch: bzr merge lp://staging/~xavi-garcia-mena/indicator-sound/sync-vivid-wily
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Xavi Garcia Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+273230@code.staging.launchpad.net

Commit message

Sync vivid and wily branches

Description of the change

Sync vivid and wily branches

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:501
http://jenkins.qa.ubuntu.com/job/indicator-sound-15.04-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-15.04-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-15.04-vivid-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-15.04-vivid-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-15.04-ci/1/rebuild

review: Approve (continuous-integration)
Revision history for this message
Xavi Garcia (xavi-garcia-mena) wrote :

Approving as it is just a merge of commits from wily.
Source code should be in sync now with wily.

review: Approve
lp://staging/~xavi-garcia-mena/indicator-sound/sync-vivid-wily updated
502. By Xavi Garcia

fixed version number in changelog

Revision history for this message
Charles Kerr (charlesk) wrote :

:)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches