[Merge] lp:~corey.bryant/heat/2014.1.2 into lp:~ubuntu-server-dev/heat/icehouse

[Corey Bryant]

Corey Bryant has proposed merging lp:~corey.bryant/heat/2014.1.2 into lp:~ubuntu-server-dev/heat/icehouse.

Requested reviews:
  Ubuntu Server Developers (ubuntu-server-dev)
Related bugs:
  Bug #1354159 in nova (Ubuntu): "[SRU] icehouse 2014.1.2 point release"
  https://bugs.launchpad.net/ubuntu/+source/nova/+bug/1354159

For more details, see:
https://code.launchpad.net/~corey.bryant/heat/2014.1.2/+merge/230620
-- 
https://code.launchpad.net/~corey.bryant/heat/2014.1.2/+merge/230620
Your team Ubuntu Server Developers is requested to review the proposed merge of lp:~corey.bryant/heat/2014.1.2 into lp:~ubuntu-server-dev/heat/icehouse.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 1071 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20140813/5d69ef53/attachment-0001.diff>