[Merge] lp:~james-page/python-cinderclient/re-enable-trunk into lp:~ubuntu-server-dev/python-cinderclient/havana

[James Page]

James Page has proposed merging lp:~james-page/python-cinderclient/re-enable-trunk into lp:~ubuntu-server-dev/python-cinderclient/havana.

Requested reviews:
  Ubuntu Server Developers (ubuntu-server-dev)

For more details, see:
https://code.launchpad.net/~james-page/python-cinderclient/re-enable-trunk/+merge/175566

Re-enabled required fixes for trunk.
-- 
https://code.launchpad.net/~james-page/python-cinderclient/re-enable-trunk/+merge/175566
Your team Ubuntu Server Developers is requested to review the proposed merge of lp:~james-page/python-cinderclient/re-enable-trunk into lp:~ubuntu-server-dev/python-cinderclient/havana.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 1940 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20130718/d4235d83/attachment-0001.diff>