Merge lp://staging/~michihenning/thumbnailer/request-cancellation into lp://staging/thumbnailer/devel
Proposed by
Michi Henning
| Status: | Merged |
|---|---|
| Approved by: | James Henstridge |
| Approved revision: | 319 |
| Merged at revision: | 292 |
| Proposed branch: | lp://staging/~michihenning/thumbnailer/request-cancellation |
| Merge into: | lp://staging/thumbnailer/devel |
| Diff against target: |
1495 lines (+570/-158) 23 files modified
data/com.canonical.Unity.Thumbnailer.gschema.xml (+8/-0) debian/changelog (+2/-0) debian/libthumbnailer-qt1.0.symbols (+1/-0) include/internal/thumbnailer.h (+1/-24) include/ratelimiter.h (+8/-3) include/settings.h (+2/-0) include/unity/thumbnailer/qt/thumbnailer-qt.h (+12/-6) man/thumbnailer-settings.5 (+25/-12) plugins/Ubuntu/Thumbnailer.0.1/thumbnailerimageresponse.cpp (+1/-1) src/libthumbnailer-qt/libthumbnailer-qt.cpp (+99/-46) src/ratelimiter.cpp (+23/-11) src/service/dbusinterface.cpp (+3/-3) src/service/dbusinterface.h (+2/-2) src/service/handler.cpp (+19/-9) src/service/handler.h (+1/-1) src/settings.cpp (+14/-0) src/thumbnailer.cpp (+24/-0) src/vs-thumb/thumbnailextractor.cpp (+1/-1) tests/libthumbnailer-qt/CMakeLists.txt (+2/-0) tests/libthumbnailer-qt/libthumbnailer-qt_test.cpp (+189/-16) tests/stress/stress_test.cpp (+109/-23) tests/thumbnailer/thumbnailer_test.cpp (+19/-0) tools/parse-settings.py (+5/-0) |
| To merge this branch: | bzr merge lp://staging/~michihenning/thumbnailer/request-cancellation |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Henstridge | Approve | ||
| PS Jenkins bot (community) | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
Fixed broken request cancellation. Improved test coverage.
Description of the change
Fixed broken request cancellation. Improved test coverage.
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:290
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://