lp:~ubuntu-branches/ubuntu/precise/txaws/precise-201203281240

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu/precise/txaws

Ubuntu branches: Pending requested 2012-03-28

Diff: 1196 lines (+1120/-0) (has conflicts)

11 files modified

.pc/add-ssl-cert-verification.patch/txaws/client/base.py (+122/-0)
.pc/add-ssl-cert-verification.patch/txaws/client/tests/test_client.py (+150/-0)
.pc/add-ssl-cert-verification.patch/txaws/service.py (+145/-0)
debian/patches/add-ssl-cert-verification.patch (+500/-0)
txaws/client/ssl.py (+100/-0)
txaws/client/tests/badprivate.ssl (+15/-0)
txaws/client/tests/badpublic.ssl (+23/-0)
txaws/client/tests/private.ssl (+15/-0)
txaws/client/tests/private_san.ssl (+16/-0)
txaws/client/tests/public.ssl (+22/-0)
txaws/client/tests/public_san.ssl (+12/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

20. By Clint Byrum on 2012-03-28

releasing version 0.2-0ubuntu10

19. By Clint Byrum on 2012-03-28

d/patches/add-ssl-cert-verification.patch: Cherry pick patch from
upstream to enable SSL certificate verification. (LP: #781949)

18. By Clint Byrum on 2012-03-24

* d/patches/aws-status-add-appindicator.patch: Add support for
  appindicator so GUI is visible and useful in Unity. (LP: #802950)
* d/rules,d/python-txaws.manpages,d/manpages: Generate basic manpages
  using help2man. (LP: #964164)
* d/aws-status.install: install new basic manpage and add desktop file.

17. By Clint Byrum on 2012-01-06

releasing version 0.2-0ubuntu8

16. By Clint Byrum on 2012-01-06

  and switches to dateutil, which is already in main. (LP: #856067)
  dependency and switches to dateutil. (LP: #912607)

15. By Clint Byrum on 2012-01-06

updating forwarded headers to reflect upstream merges

14. By Clint Byrum on 2012-01-06

remove python-zope.datetime from deps

13. By Clint Byrum on 2012-01-06

d/patches/drop-zope-datetime.patch: Removes zope.datetime
dependency and switches to dateutil.

12. By Clint Byrum on 2012-01-06

d/patches/drop-pytz.patch: Removes pytz dependency and
switches to dateutil. (LP: #912589)

11. By Clint Byrum on 2012-01-06

d/patches/drop-epsilon.patch: Removes epsilon dependency in
and switches to dateutil, which is already in main.