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

[Chuck Short]

see comment

Diff comments:

> === modified file 'debian/changelog'
> --- debian/changelog	2014-05-16 16:11:19 +0000
> +++ debian/changelog	2014-06-09 19:07:23 +0000
> @@ -1,3 +1,16 @@
> +ceilometer (2014.1.1-0ubuntu1) trusty; urgency=medium
> +
> +  * Resynchronize with stable/icehouse (a1ec218) (LP: #1328134):

Shouldnt the is be 84635e6?

> +    - [84635e6] Fix testing gate due to new keystoneclient release
> +    - [c52904d] Fix network notifications of neutron bulk creation
> +    - [06eb8bc] Sync kombu_reconnect_delay from Oslo
> +    - [d247af3] Updated from global requirements
> +    - [82eed26] Disable specifying alarm itself in combination rule
> +    - [94c12fd] Adapt failing tests for latest wsme version
> +    - [a1ec218] Use known protocol scheme in keystone tests
> +
> + -- Corey Bryant <corey.bryant at canonical.com>  Mon, 09 Jun 2014 14:49:20 -0400
> +
>  ceilometer (2014.1-0ubuntu1.1) trusty; urgency=medium
>  
>    * d/p/fix-requirements.patch: Drop required version of pecan to 0.3.0
> 


-- 
https://code.launchpad.net/~corey.bryant/ceilometer/2014.1.1/+merge/222542
Your team Ubuntu Server Developers is requested to review the proposed merge of lp:~corey.bryant/ceilometer/2014.1.1 into lp:~ubuntu-server-dev/ceilometer/icehouse.