Merge lp:~corey.bryant/nova/2014.1.3-0ubuntu2 into lp:~ubuntu-server-dev/nova/icehouse

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2014-11-12 14:29:23 +0000
+++ debian/changelog	2014-11-17 17:58:48 +0000
@@ -6,6 +6,18 @@
 
  -- Chuck Short <[e-mail]>  Wed, 12 Nov 2014 09:22:45 -0500
 
+nova (1:2014.1.3-0ubuntu1.1) trusty-security; urgency=medium
+
+  * No change rebuild for security:
+    - [82a13b3] VM in rescue state must have a restricted set of actions
+      + CVE-2014-3604
+      + LP: #1338830
+    - [f58d95c] Sync process and str utils from oslo
+      + CVE-2014-7230
+      + LP: #1343604
+
+ -- Marc Deslauriers <[e-mail]>  Tue, 21 Oct 2014 12:07:58 -0400
+
 nova (1:2014.1.3-0ubuntu1) trusty; urgency=medium
 
   [ Liam Young ]