Merge lp:~townsend/libertine-scope/release-1.3.2 into lp:libertine-scope/release
Proposed by
Christopher Townsend
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Larry Price | ||||||||
Approved revision: | 56 | ||||||||
Merged at revision: | 57 | ||||||||
Proposed branch: | lp:~townsend/libertine-scope/release-1.3.2 | ||||||||
Merge into: | lp:libertine-scope/release | ||||||||
Diff against target: |
494 lines (+203/-57) 15 files modified
CMakeLists.txt (+1/-1) debian/changelog (+11/-0) scope/apps/action.cpp (+26/-15) scope/apps/action.h (+21/-15) scope/apps/config.h.in (+1/-3) scope/apps/libertine.cpp (+1/-2) scope/apps/libertine.h (+1/-1) scope/apps/query.cpp (+7/-5) scope/apps/query.h (+2/-2) scope/apps/scope.cpp (+14/-1) scope/apps/scope.h (+1/-0) tests/CMakeLists.txt (+2/-0) tests/mock_hidden_apps.h (+32/-0) tests/test_action.cpp (+82/-0) tests/test_query.cpp (+1/-12) |
||||||||
To merge this branch: | bzr merge lp:~townsend/libertine-scope/release-1.3.2 | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Larry Price | Approve | ||
Libertine CI Bot | continuous-integration | Pending | |
Review via email: mp+301524@code.launchpad.net |
This proposal supersedes a proposal from 2016-07-29.
To post a comment you must log in.
PASSED: Continuous integration, rev:56 /jenkins. canonical. com/libertine/ job/lp- libertine- scope-ci/ 63/ /jenkins. canonical. com/libertine/ job/build/ 224 /jenkins. canonical. com/libertine/ job/test- 0-autopkgtest/ label=amd64, release= vivid+overlay, testname= default/ 182 /jenkins. canonical. com/libertine/ job/test- 0-autopkgtest/ label=amd64, release= xenial+ overlay, testname= default/ 182 /jenkins. canonical. com/libertine/ job/test- 0-autopkgtest/ label=amd64, release= yakkety, testname= default/ 182 /jenkins. canonical. com/libertine/ job/test- 0-autopkgtest/ label=i386, release= vivid+overlay, testname= default/ 182 /jenkins. canonical. com/libertine/ job/test- 0-autopkgtest/ label=i386, release= xenial+ overlay, testname= default/ 182 /jenkins. canonical. com/libertine/ job/test- 0-autopkgtest/ label=i386, release= yakkety, testname= default/ 182 /jenkins. canonical. com/libertine/ job/lp- generic- update- mp/170/ console /jenkins. canonical. com/libertine/ job/build- 0-fetch/ 227 /jenkins. canonical. com/libertine/ job/build- 1-sourcepkg/ release= vivid+overlay/ 212 /jenkins. canonical. com/libertine/ job/build- 1-sourcepkg/ release= xenial+ overlay/ 212 /jenkins. canonical. com/libertine/ job/build- 1-sourcepkg/ release= yakkety/ 212 /jenkins. canonical. com/libertine/ job/build- 2-binpkg/ arch=amd64, release= vivid+overlay/ 205 /jenkins. canonical. com/libertine/ job/build- 2-binpkg/ arch=amd64, release= vivid+overlay/ 205/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/libertine/ job/build- 2-binpkg/ arch=amd64, release= xenial+ overlay/ 205 /jenkins. canonical. com/libertine/ job/build- 2-binpkg/ arch=amd64, release= xenial+ overlay/ 205/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/libertine/ job/build- 2-binpkg/ arch=amd64, release= yakkety/ 205 /jenkins. canonical. com/libertine/ job/build- 2-binpkg/ arch=amd64, release= yakkety/ 205/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/libertine/ job/build- 2-binpkg/ arch=i386, release= vivid+overlay/ 205 /jenkins. canonical. com/libertine/ job/build- 2-binpkg/ arch=i386, release= vivid+overlay/ 205/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/libertine/ job/build- 2-binpkg/ arch=i386, release= xenial+ overlay/ 205 /jenkins. canonical. com/libertine/ job/build- 2-binpkg/ arch=i386, release= xenial+ overlay/ 205/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/libertine/ job/build- 2-binpkg/ arch=i386, release= yakkety/ 205 /jenkins. canonical. com/libertine/ job/build- 2-binpkg/ arch=i386, release= yakkety/ 205/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /jenkins. canonical. com/libertine/ job/lp- libertine- scope-ci/ 63/rebuild
https:/