Merge lp://staging/~dobey/ubuntuone-client/skip-zip into lp://staging/ubuntuone-client

Proposed by dobey
Status: Merged
Approved by: Roberto Alsina
Approved revision: 1306
Merged at revision: 1306
Proposed branch: lp://staging/~dobey/ubuntuone-client/skip-zip
Merge into: lp://staging/ubuntuone-client
Diff against target: 19 lines (+2/-0)
1 file modified
tests/syncdaemon/test_action_queue.py (+2/-0)
To merge this branch: bzr merge lp://staging/~dobey/ubuntuone-client/skip-zip
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Alejandro J. Cura (community) trivial Approve
Review via email: mp+123351@code.staging.launchpad.net

Commit message

Skip test_zip_acquire_lock as it fails intermittently with twisted 12.x

To post a comment you must log in.
Revision history for this message
Alejandro J. Cura (alecu) :
review: Approve (trivial)
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches