← Back to branch summary

~soren/nova/iptables-security-groups

~soren/nova/iptables-security-groups

« back to all changes in this revision

Viewing changes to nova/tests/test_scheduler.py

Committer: Rick Harris
Date: 2010-12-30 17:26:21 UTC
mfrom: (430.2.74 nova)
mto: (430.2.75 nova)
mto: This revision was merged to the branch mainline in revision 442.
Revision ID: rick.harris@rackspace.com-20101230172621-74ahwykav8gh24u5

Merging trunk

files added:
plugins/xenserver

plugins/xenserver/doc

plugins/xenserver/doc/networking.rst

plugins/xenserver/networking

plugins/xenserver/networking/etc

plugins/xenserver/networking/etc/init.d

plugins/xenserver/networking/etc/init.d/host-rules

plugins/xenserver/networking/etc/xensource

plugins/xenserver/networking/etc/xensource/scripts

plugins/xenserver/networking/etc/xensource/scripts/vif_5.6-fp1.patch

plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py

files renamed:
plugins/xenapi/ => plugins/xenserver/xenapi/

files modified:
.mailmap

Authors

nova/api/openstack/__init__.py

nova/api/openstack/backup_schedules.py

nova/api/openstack/ratelimiting/__init__.py

nova/api/openstack/servers.py

nova/api/openstack/sharedipgroups.py

nova/tests/test_scheduler.py

nova/tests/test_virt.py

nova/virt/libvirt_conn.py

nova/wsgi.py

Show diffs side-by-side

added added

removed removed

nova/tests/test_scheduler.py

33

33

34

34

FLAGS = flags.FLAGS

35

35

flags.DECLARE('max_cores', 'nova.scheduler.simple')

36

flags.DECLARE('stub_network', 'nova.compute.manager')

36

37

37

38

38

39

class TestDriver(driver.Scheduler):

Older »