[Merge] lp:~hopem/nova/icehouse-sru-lp1459046 into lp:~ubuntu-server-dev/nova/icehouse

[James Page]

Review: Needs Fixing



Diff comments:

> === modified file 'debian/changelog'
> --- debian/changelog	2015-07-15 13:52:24 +0000
> +++ debian/changelog	2015-07-15 16:35:25 +0000
> @@ -1,3 +1,13 @@
> +nova (1:2014.1.5-0ubuntu1.3) UNRELEASED; urgency=medium

1.3 -> 1.2

> +
> +  [ Edward Hope-Morley ]

No need for you name here - you own the changelog entry.

> +  * Add rsyslog retry support (LP: #1459046)
> +    - d/p/add-support-for-syslog-connect-retries.patch
> +  * Add vm clean shutdown support (LP: #1196924)
> +    - d/p/clean-shutdown.patch
> +
> + -- Edward Hope-Morley <edward.hope-morley at canonical.com>  Wed, 15 Jul 2015 18:33:42 +0200
> +
>  nova (1:2014.1.5-0ubuntu1.1) trusty; urgency=medium
>  
>      [ Edward Hope-Morley ]


-- 
https://code.launchpad.net/~hopem/nova/icehouse-sru-lp1459046/+merge/264872
Your team Ubuntu Server Developers is subscribed to branch lp:~ubuntu-server-dev/nova/icehouse.