Merge lp://staging/~stolowski/unity-lens-files/merge-smartscopes into lp://staging/unity-lens-files
Proposed by
Paweł Stołowski
Status: | Merged |
---|---|
Approved by: | Łukasz Zemczak |
Approved revision: | 258 |
Merged at revision: | 254 |
Proposed branch: | lp://staging/~stolowski/unity-lens-files/merge-smartscopes |
Merge into: | lp://staging/unity-lens-files |
Diff against target: |
1339 lines (+360/-410) 15 files modified
Makefile.am (+7/-7) configure.ac (+16/-16) data/Makefile.am (+2/-2) data/unity-scope-files-local.service.in (+1/-1) debian/changelog (+6/-0) debian/control (+1/-1) local.scope.in.in (+6/-5) po/POTFILES.in (+1/-1) src/Makefile.am (+5/-5) src/daemon.vala (+293/-289) src/locate.vala (+1/-1) src/main.vala (+3/-3) src/schemas.vala (+1/-20) src/utils.vala (+15/-57) tests/Makefile.am (+2/-2) |
To merge this branch: | bzr merge lp://staging/~stolowski/unity-lens-files/merge-smartscopes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Łukasz Zemczak | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+164231@code.staging.launchpad.net |
Commit message
Merge new scope API changes (100 scopes feature).
Description of the change
Merge new scope API changes (100 scopes feature).
Note: needs libunity 7.0.0 to land (should happen very soon).
To post a comment you must log in.
FAILED: Continuous integration, rev:256 jenkins. qa.ubuntu. com/job/ unity-lens- files-ci/ 2/ jenkins. qa.ubuntu. com/job/ unity-lens- files-raring- amd64-ci/ 2/console jenkins. qa.ubuntu. com/job/ unity-lens- files-raring- armhf-ci/ 2/console jenkins. qa.ubuntu. com/job/ unity-lens- files-raring- i386-ci/ 2/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ unity-lens- files-ci/ 2/rebuild
http://