lp:~cerberus/nova/lp809587

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~hudson-openstack/nova/trunk at revision 1284

Brian Waldon (community): Approve on 2011-07-20

Jason Kölker (community): Approve on 2011-07-20

Josh Kearney (community): Approve on 2011-07-19

Diff: 109 lines (+61/-4)

2 files modified

nova/compute/manager.py (+10/-4)
nova/tests/test_compute.py (+51/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #809587: Resize revert applies wrong flavor to original instance

High

Fix Released

Link a bug report

Related blueprints

1283. By Matt Dietz on 2011-07-19

Functionality fixed and new test passing

1282. By Matt Dietz on 2011-07-19

Merge from trunk

1281. By Matt Dietz on 2011-07-19

Beginnings of the patch

1280. By Brian Waldon on 2011-07-15

Ensures a bookmark link is returned in GET /images. Before, it was only returned in GET /images/detail

1279. By Kevin L. Mitchell on 2011-07-15

Adds greater configuration flexibility to rate limiting via api-paste.ini. In particular:

* "limits" relation provides a string representation of desired default limits in the form:

  - '(VERB, URI, REGEX, VALUE, UNIT); (VERB, URI, REGEX, VALUE, UNIT)'[...]

    + VALUE must be an integer, and UNIT must be one of SECOND, MINUTE, HOUR, DAY (case insensitive)

    + Empty string is also a valid value

* "user:<username>" relations specify limits in the same format, but per user.

* "limiter" relation can specify an alternate class to use in place of Limiter.

  - This makes it easier to use WsgiLimiterProxy if desired

(All these relations are specified in the '[filter:ratelimit]' section.)

1278. By Anne Gentle on 2011-07-15

Adds distributed scheduler and multinic docs to the Developer Reference page.

1277. By Brian Waldon on 2011-07-15

- Present ip addresses in their actual networks, not just a static public/private
- Floating ip addresses are grouped into the networks with their associated fixed ips
- Add addresses attribute to server entities

1276. By Dan Prince on 2011-07-15

Update the agent plugin so that it gets 'b64_contents' from the args dict instead of 'b64_file' (which isn't what nova sends).

1275. By Stephanie Reese on 2011-07-15

Fixes Bug #810149 that had an incomplete regex

1274. By Johannes Erdfelt on 2011-07-15

Existing Windows agent behaves differently than the Unix agents and require some workarounds to operate properly. Fixes are going into the Windows agent to make it behave better, but workarounds are needed for compatibility with existing installed base.