[Merge] lp:~soren/ubuntu/oneiric/nova/reconcile-with-security into lp:ubuntu/oneiric-proposed/nova

[Soren Hansen]

Soren Hansen has proposed merging lp:~soren/ubuntu/oneiric/nova/reconcile-with-security into lp:ubuntu/oneiric-proposed/nova.

Requested reviews:
  Ubuntu Development Team (ubuntu-dev)
Related bugs:
  Bug #868360 in nova (Ubuntu Oneiric): "Incorrect secret key causes user details to be revealed"
  https://bugs.launchpad.net/ubuntu/oneiric/+source/nova/+bug/868360

For more details, see:
https://code.launchpad.net/~soren/ubuntu/oneiric/nova/reconcile-with-security/+merge/80562

Merged oneiric-security into oneiric-proposed, added changelog entry.
-- 
https://code.launchpad.net/~soren/ubuntu/oneiric/nova/reconcile-with-security/+merge/80562
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~soren/ubuntu/oneiric/nova/reconcile-with-security into lp:ubuntu/oneiric-proposed/nova.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 64218 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20111027/697845e3/attachment-0001.diff>