lp:~michihenning/thumbnailer/better-cancel

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:thumbnailer/devel at revision 308

PS Jenkins bot (community): Approve (continuous-integration) on 2015-12-09

Michi Henning (community): Approve on 2015-12-09

James Henstridge: Approve on 2015-12-09

Diff: 565 lines (+238/-69)

5 files modified

include/ratelimiter.h (+8/-3)
include/unity/thumbnailer/qt/thumbnailer-qt.h (+8/-1)
src/libthumbnailer-qt/libthumbnailer-qt.cpp (+67/-42)
src/ratelimiter.cpp (+7/-8)
tests/libthumbnailer-qt/libthumbnailer-qt_test.cpp (+148/-15)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

315. By Michi Henning on 2015-12-09

Undid incorrect merge from devel.

314. By Michi Henning on 2015-12-09

Merged devel and resolved conflicts.

313. By Michi Henning on 2015-11-29

Back to queue-based limiter, with minor change in done().

312. By Michi Henning on 2015-11-27

Increased wait time again for Jenkins.

311. By Michi Henning on 2015-11-27

Merged devel.

310. By Michi Henning on 2015-11-27

Another test adjustment.

309. By Michi Henning on 2015-11-27

Relaxed test to allow for slow machines when building on Jenkins.

308. By Michi Henning on 2015-11-27

Removed trace from test.

307. By Michi Henning on 2015-11-27

Removed redundant capture from lambda.

306. By Michi Henning on 2015-11-27

Cancellations and signals now working correctly. Still using overly
complex rate limiter.