Merge lp:~corey.bryant/ceilometer/2013.2.3 into lp:~ubuntu-server-dev/ceilometer/havana

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-26 09:09:47 +0000
+++ debian/changelog	2014-04-04 16:13:10 +0000
@@ -1,3 +1,25 @@
+ceilometer (2013.2.3-0ubuntu1) saucy-proposed; urgency=medium
+
+  * debian/patches/fix-setup-requirements.patch: Rebase on top of
+    new upstream requirements.txt file.
+  * Resynchronize with stable/havana (0ac6942) (LP: #1302575):
+    - [c92c106] latest alembic imcompatible with current sqlalchemy requirements
+    - [4ffeead] User a more accurate max_delay for reconnects
+    - [6637acd] Checks for presence of Hyper-V cpu metrics before accessing
+    - [7cb5f4c] Fix ceilometer.conf.sample mismatch
+    - [ebe72d5] Fixes Hyper-V Inspector disk metrics bug
+    - [bbab3d5] Fix validation error for invalid field name in simple query
+    - [83a2725] Adds doc string to query validate functions in V2 API
+    - [4461828] Ensure insecure config option propagated by alarm service
+    - [0a1db09] Fix the default rpc policy value
+    - [b13ee97] Ensure the correct error message is displayed
+    - [2c6a84f] Refactor timestamp existence validation in V2 API
+    - [ff0375c] cacert is not picked up correctly by alarm services
+    - [0a85f22] Add an insecure option for Keystone client
+    - [0ac6942] Propogate cacert and insecure flags to glanceclient
+
+ -- Corey Bryant <[e-mail]>  Fri, 04 Apr 2014 12:02:50 -0400
+
 ceilometer (2013.2.2-0ubuntu1) saucy-proposed; urgency=low
 
   * Resynchronize with stable/havana (9149861) (LP: #1284643):
 
=== added file 'debian/patches/fix-setup-requirements.patch'
--- debian/patches/fix-setup-requirements.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-setup-requirements.patch	2014-04-04 16:13:10 +0000
@@ -0,0 +1,15 @@
+Description: Bump requirements to support sqlalchemy 0.8.2
+Author: Chuck Short <[e-mail]>
+Forwarded: No
+Index: ceilometer/requirements.txt
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -3,7 +3,7 @@
+ kombu>=2.4.8
+ iso8601>=0.1.8
+ argparse
+-SQLAlchemy>=0.7.8,<=0.7.99
++SQLAlchemy>=0.7.8,<=0.8.99
+ sqlalchemy-migrate>=0.7.2
+ alembic>=0.4.1,<0.6.4
+ netaddr
 
=== removed file 'debian/patches/fix-setup-requirements.patch'
--- debian/patches/fix-setup-requirements.patch	2013-12-18 03:51:19 +0000
+++ debian/patches/fix-setup-requirements.patch	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-Description: Bump requirements to support sqlalchemy 0.8.2
-Author: Chuck Short <[e-mail]>
-Forwarded: No
-Index: ceilometer/requirements.txt
-===================================================================
---- ceilometer.orig/requirements.txt	2013-12-17 19:50:28.051735156 -0800
-+++ ceilometer/requirements.txt	2013-12-17 19:50:28.043735156 -0800
-@@ -3,7 +3,7 @@
- kombu>=2.4.8
- iso8601>=0.1.8
- argparse
--SQLAlchemy>=0.7.8,<=0.7.99
-+SQLAlchemy>=0.7.8,<=0.8.99
- sqlalchemy-migrate>=0.7.2
- alembic>=0.4.1
- netaddr
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-12-18 18:07:39 +0000
+++ debian/patches/series	2014-04-04 16:13:10 +0000
@@ -1,6 +1,6 @@
+fix-setup-requirements.patch
 default-dbconnection-sqlite.patch
 skip-database-tests.patch
-fix-setup-requirements.patch
 revert-keystone-compat.patch
 revert-keystone-compat-2.patch
 revert-stable-havana-requirements.patch