[Merge] lp:~zulcss/nova/nova-trusty into lp:~ubuntu-server-dev/nova/icehouse

[Chuck Short]

Chuck Short has proposed merging lp:~zulcss/nova/nova-trusty into lp:~ubuntu-server-dev/nova/icehouse.

Requested reviews:
  Ubuntu Server Developers (ubuntu-server-dev)
Related bugs:
  Bug #1197386 in nova (Ubuntu): "nova-xcp-network does not place the scripts under the correct directory"
  https://bugs.launchpad.net/ubuntu/+source/nova/+bug/1197386
  Bug #1199791 in nova (Ubuntu): "nova-compute-xcp misses nova-compute.conf"
  https://bugs.launchpad.net/ubuntu/+source/nova/+bug/1199791

For more details, see:
https://code.launchpad.net/~zulcss/nova/nova-trusty/+merge/195620

Fixes FTBFS on trusty
-- 
https://code.launchpad.net/~zulcss/nova/nova-trusty/+merge/195620
Your team Ubuntu Server Developers is requested to review the proposed merge of lp:~zulcss/nova/nova-trusty into lp:~ubuntu-server-dev/nova/icehouse.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 51543 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20131118/71bd58e1/attachment-0001.diff>