Merge lp://staging/~jpakkane/unity-scope-mediascanner/videoaggregator into lp://staging/unity-scope-mediascanner
Proposed by
Jussi Pakkanen
Status: | Merged |
---|---|
Approved by: | Paweł Stołowski |
Approved revision: | 70 |
Merged at revision: | 58 |
Proposed branch: | lp://staging/~jpakkane/unity-scope-mediascanner/videoaggregator |
Merge into: | lp://staging/unity-scope-mediascanner |
Prerequisite: | lp://staging/~jamesh/unity-scope-mediascanner/scopes-api-0.3 |
Diff against target: |
379 lines (+266/-6) 12 files modified
data/CMakeLists.txt (+9/-0) data/videoaggregator.ini.in (+11/-0) debian/unity-scope-mediascanner2.install (+1/-0) oldscope/CMakeLists.txt (+1/-1) src/CMakeLists.txt (+10/-0) src/musicaggregatorquery.cpp (+5/-2) src/musicaggregatorscope.cpp (+8/-2) src/videoaggregatorquery.cpp (+51/-0) src/videoaggregatorquery.h (+44/-0) src/videoaggregatorscope.cpp (+78/-0) src/videoaggregatorscope.h (+47/-0) tests/CMakeLists.txt (+1/-1) |
To merge this branch: | bzr merge lp://staging/~jpakkane/unity-scope-mediascanner/videoaggregator |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Paweł Stołowski (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Michal Hruby (community) | Needs Fixing | ||
Review via email: mp+205726@code.staging.launchpad.net |
Commit message
Video aggregator scope.
Description of the change
Video aggregator scope.
Missing the correct name so don't merge quite yet.
To post a comment you must log in.
FAILED: Continuous integration, rev:67 jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- ci/49/ jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- trusty- amd64-ci/ 31/console jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- trusty- armhf-ci/ 31/console jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- trusty- i386-ci/ 31/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- scope-mediascan ner-ci/ 49/rebuild
http://