[Merge] lp:~smoser/nova/lp838581 into lp:~ubuntu-server-dev/nova/diablo

[Scott Moser]

Scott Moser has proposed merging lp:~smoser/nova/lp838581 into lp:~ubuntu-server-dev/nova/diablo.

Requested reviews:
  Ubuntu Server Developers (ubuntu-server-dev)
Related bugs:
  Bug #838581 in OpenStack Compute (nova): "Failures in db_pool code: 'NoneType' object has no attribute '_keymap' or not returning rows."
  https://bugs.launchpad.net/nova/+bug/838581

For more details, see:
https://code.launchpad.net/~smoser/nova/lp838581/+merge/78528

This is cherry picked from the upstream commit that fixed this bug.
I have not tested this.  I'm in the process of doing so, but wanted to let others see the patch.

-- 
https://code.launchpad.net/~smoser/nova/lp838581/+merge/78528
Your team Ubuntu Server Developers is requested to review the proposed merge of lp:~smoser/nova/lp838581 into lp:~ubuntu-server-dev/nova/diablo.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 4442 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20111007/1b646d0a/attachment.diff>