X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=debian%2Fchangelog;h=0ebb2094ab0753d10f01671dba62d36852f72dca;hb=8eae4ebe951524c2961c98ac8f02a36f8b8d735b;hp=04298bda9cc00b3fe2c552c1861e40c72396510d;hpb=36bbde33932c49d59a96394b8d02b0430c6d4431;p=openstack-build%2Fceilometer-build.git

diff --git a/debian/changelog b/debian/changelog
index 04298bd..0ebb209 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,45 @@
-ceilometer (2014.1~rc1-0ubuntu1~cloud0) precise-icehouse; urgency=medium
+ceilometer (2014.1.1-0ubuntu1) trusty; urgency=medium
 
-  * New update for the Ubuntu Cloud Archive.
+  * Resynchronize with stable/icehouse (a1ec218) (LP: #1328134):
+    - [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
 
- -- Openstack Ubuntu Testing Bot <openstack-testing-bot@ubuntu.com>  Tue, 01 Apr 2014 00:14:21 -0400
+ -- Corey Bryant <corey.bryant@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
+    inline with the version that is provided in 14.04 (LP: #1317147).
+
+ -- James Page <james.page@ubuntu.com>  Fri, 16 May 2014 12:11:00 -0400
+
+ceilometer (2014.1-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release (LP: #1299055).
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Wed, 16 Apr 2014 13:04:53 -0400
+
+ceilometer (2014.1~rc3-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release candidate (LP: #1299055).
+
+ -- Chuck Short <zulcss@ubuntu.com>  Tue, 15 Apr 2014 20:29:38 -0400
+
+ceilometer (2014.1~rc2-0ubuntu1) trusty; urgency=medium
+
+  [ James Page ]
+  * d/ceilometer-common.postinst: Only run db sync process if default sqlite
+    connection is configured in /etc/ceilometer/ceilometer.conf (LP: #1182964).
+
+  [ Chuck Short ]
+  * New upstream release (LP: #1299055).
+
+ -- Chuck Short <zulcss@ubuntu.com>  Tue, 08 Apr 2014 15:41:50 -0400
 
 ceilometer (2014.1~rc1-0ubuntu1) trusty; urgency=medium