[Merge] lp:~corey.bryant/ubuntu/trusty/python-boto/jenkins-2014-02-26 into lp:ubuntu/trusty-proposed/python-boto

[Corey Bryant]

Corey Bryant has proposed merging lp:~corey.bryant/ubuntu/trusty/python-boto/jenkins-2014-02-26 into lp:ubuntu/trusty-proposed/python-boto.

Requested reviews:
  Ubuntu Development Team (ubuntu-dev)

For more details, see:
https://code.launchpad.net/~corey.bryant/ubuntu/trusty/python-boto/jenkins-2014-02-26/+merge/212722

  * Fix autopkgtest error in test_timeout
  * Add patch to work around autopkgtest failure in test_trim_defaults

-- 
https://code.launchpad.net/~corey.bryant/ubuntu/trusty/python-boto/jenkins-2014-02-26/+merge/212722
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~corey.bryant/ubuntu/trusty/python-boto/jenkins-2014-02-26 into lp:ubuntu/trusty-proposed/python-boto.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 1492 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20140325/8c8997d3/attachment-0001.diff>