lp:~ed-leafe/nova/xs-file-inject

Branch merges

Propose for merging

No branches dependent on this one.

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

Jay Pipes (community): Approve on 2011-02-17

Devin Carlen (community): Approve on 2011-02-17

Rick Harris (community): Needs Information on 2011-02-17

Chris Behrens (community): Approve on 2011-02-16

Diff: 430 lines (+164/-32)

10 files modified

nova/api/openstack/servers.py (+2/-1)
nova/compute/api.py (+10/-5)
nova/compute/manager.py (+39/-22)
nova/tests/test_compute.py (+8/-0)
nova/utils.py (+23/-0)
nova/virt/fake.py (+15/-0)
nova/virt/xenapi/vmops.py (+50/-0)
nova/virt/xenapi_conn.py (+6/-0)
plugins/xenserver/xenapi/etc/xapi.d/plugins/agent (+2/-3)
plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py (+9/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

639. By Ed Leafe on 2011-02-17

Uncommitted changes using the wrong author, and re-committing under the correct author

638. By Vish Ishaya on 2011-01-28

Disassociate all floating ips on terminate instance.

637. By Vish Ishaya on 2011-01-28

Fixes simple scheduler to able to be run_instance by admins + availability zones.

636. By Monty Taylor on 2011-01-28

Makes having sphinx to build docs a conditional thing - if you have it, you can get docs. If you don't, you can't.

635. By Ryan Lane on 2011-01-28

Adds security group output to describe_instances.

634. By Todd Willey on 2011-01-28

Use firewall_driver flag as expected with NWFilterFirewall. This way, either you use NWFilterFirewall directly, or you use IptablesFirewall, which creates its own instance of NWFilterFirewall for the setup_basic_filtering command. This removes the requirement that LibvirtConnection would always need to know about NWFirewallFilter, and cleans up the area where the flag is used for loading the firewall class.

633. By Ed Leafe on 2011-01-28

Added a test that checks for localized strings in the source code that contain position-based string formatting placeholders. If found, an exception message is generated that summarizes the problem, as well as the location of the problematic code. This will prevent future trunk commits from adding localized strings that cannot be properly translated.

632. By Vish Ishaya on 2011-01-27

Makes sure all instance and volume commands that raise not found are changed to show the ec2_id instead of the internal id.

631. By Jordan Rinke on 2011-01-27

Changed cpu limit to a static value of 100000 (100%) instead of using the vcpu value of 1. There is no weight/limit variable now so I see no other solution than the static max limit.

630. By Thierry Carrez on 2011-01-27

Make nova.virt.images fetch images from a Glance URL when Glance is used as the image service (rather than unconditionally fetch them from an S3/objectstore URL).