Merge lp://qastaging/~corey.bryant/ceilometer/2014.1.2 into lp://qastaging/~ubuntu-server-dev/ceilometer/icehouse

Proposed by Corey Bryant
Status: Merged
Merged at revision: 104
Proposed branch: lp://qastaging/~corey.bryant/ceilometer/2014.1.2
Merge into: lp://qastaging/~ubuntu-server-dev/ceilometer/icehouse
Diff against target: 91 lines (+15/-27)
3 files modified
debian/changelog (+14/-0)
debian/patches/fix-requirements.patch (+0/-26)
debian/patches/series (+1/-1)
To merge this branch: bzr merge lp://qastaging/~corey.bryant/ceilometer/2014.1.2
Reviewer Review Type Date Requested Status
Chuck Short (community) Approve
Review via email: mp+230120@code.qastaging.launchpad.net
To post a comment you must log in.
104. By Corey Bryant

* Resynchronize with stable/icehouse (2b6454f) (LP: #1354159):
  - [e491837] Set python hash seed to 0 in tox.ini
  - [99b7ef8] Update ensure()/reconnect() to catch MessagingError
  - [af1eb64] Sync RPC module from oslo, fixing reconnect failures
  - [47770db] Adds Content-Type to alarm REST notifier
  - [4be8616] Remove low-value logging from publication codepath
  - [096106f] Ensure routing key is specified in the address for a direct producer
  - [2b6454f] remove token from notifier middleware
* d/p/fix-requirements.patch: Refresh.

Revision history for this message
Chuck Short (zulcss) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches