Merge lp:~thedac/ceilometer/kilo into lp:~ubuntu-server-dev/ceilometer/kilo

[David Ames]

Resynchronize with stable/kilo (e7c2286) (LP: #1481008)

[Corey Bryant (corey.bryant)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-03 17:39:00 +0000
+++ debian/changelog	2015-08-03 22:17:37 +0000
@@ -1,3 +1,19 @@
+ceilometer (2015.1.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/kilo (e7c2286) (LP: #1481008):
+    - [6ea8dd1] Handle database failures on api startup
+    - [95ff1fc] Mask database.event_connection details in logs
+    - [b28a8bb] Fix the meter unit types to be consistent
+    - [023cfd1] api: record severity change in alarm history
+    - [349be3d] [elasticsearch] default trait type to string
+    - [f200c54] Fixes DiskInfoPollster AttributeError exception
+    - [76dc5d8] Update a test to properly anticipate HTTP 405 for RestController
+    - [77b1fb5] Fixing event types pattern for Role Noti. handler
+    - [e7c2286] stop mocking os.path in test_setup_events_default_config
+  * d/p/disable-kafka.patch: Rebased.
+
+ -- David Ames <[e-mail]>  Mon, 03 Aug 2015 13:37:56 -0700
+
 ceilometer (2015.1.0-0ubuntu1) vivid; urgency=medium
 
   [ Corey Bryant ]
 
=== modified file 'debian/patches/disable-kafka.patch'
--- debian/patches/disable-kafka.patch	2015-04-30 13:34:55 +0000
+++ debian/patches/disable-kafka.patch	2015-08-03 22:17:37 +0000
@@ -31,9 +31,9 @@
 +++ b/requirements.txt
 @@ -9,7 +9,6 @@
  iso8601>=0.1.9
- jsonpath-rw>=1.2.0,<2.0
- jsonschema>=2.0.0,<3.0.0
+ jsonpath-rw<2.0,>=1.2.0
+ jsonschema<3.0.0,>=2.0.0
 -kafka-python>=0.9.2 # Apache-2.0
- keystonemiddleware>=1.5.0,<1.6.0
+ keystonemiddleware<1.6.0,>=1.5.0
  lxml>=2.3
  msgpack-python>=0.4.0