lp://staging/~michihenning/thumbnailer/qt-rate-limiter

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/thumbnailer/devel at revision 287

PS Jenkins bot (community): Approve (continuous-integration) on 2015-10-14

James Henstridge: Approve on 2015-10-13

Diff: 1188 lines (+328/-218)

24 files modified

data/com.canonical.Unity.Thumbnailer.gschema.xml (+2/-10)
debian/control (+1/-0)
include/ratelimiter.h (+4/-2)
include/unity/thumbnailer/qt/thumbnailer-qt.h (+11/-2)
man/thumbnailer-settings.5 (+6/-2)
plugins/Ubuntu/Thumbnailer.0.1/CMakeLists.txt (+0/-11)
plugins/Ubuntu/Thumbnailer.0.1/albumartgenerator.cpp (+3/-9)
plugins/Ubuntu/Thumbnailer.0.1/albumartgenerator.h (+1/-4)
plugins/Ubuntu/Thumbnailer.0.1/artistartgenerator.cpp (+3/-9)
plugins/Ubuntu/Thumbnailer.0.1/artistartgenerator.h (+1/-4)
plugins/Ubuntu/Thumbnailer.0.1/plugin.cpp (+3/-8)
plugins/Ubuntu/Thumbnailer.0.1/thumbnailerimageresponse.cpp (+7/-21)
plugins/Ubuntu/Thumbnailer.0.1/thumbnailerimageresponse.h (+1/-7)
plugins/Ubuntu/Thumbnailer.0.1/thumbnailgenerator.cpp (+3/-9)
plugins/Ubuntu/Thumbnailer.0.1/thumbnailgenerator.h (+1/-4)
src/libthumbnailer-qt/libthumbnailer-qt.cpp (+88/-26)
src/ratelimiter.cpp (+2/-2)
src/service/dbusinterface.cpp (+1/-1)
src/thumbnailer.cpp (+0/-1)
src/ubuntuserverdownloader.cpp (+3/-1)
tests/libthumbnailer-qt/CMakeLists.txt (+3/-0)
tests/libthumbnailer-qt/libthumbnailer-qt_test.cpp (+27/-0)
tests/stress/CMakeLists.txt (+4/-2)
tests/stress/stress_test.cpp (+153/-83)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

298. By Michi Henning on 2015-10-14

Review comments from James.

297. By Michi Henning on 2015-09-30

Removed redundant #include.

296. By Michi Henning on 2015-09-30

Merged devel and resolved conflicts.

295. By Michi Henning on 2015-09-22

Added test for Chinese filename.

294. By Michi Henning on 2015-09-22

Reduced max-backlog to 20, otherwise we blow the reply timeout on Arm for video thumbnails.

293. By Michi Henning on 2015-09-22

Increased wait time for tests on Arm.

292. By Michi Henning on 2015-09-21

Disabled stress test for now, so I can get packages for local testing.

291. By Michi Henning on 2015-09-21

Dropping backlog to 60 to see whether that fixes test failure on Arm.

290. By Michi Henning on 2015-09-21

Removed outdated gsettings item. Updated doc for missing gsettings item.

289. By Michi Henning on 2015-09-21

Added suppression directive for coverage.