lp:~jason-koelker/nova/lp810092

Branch merges

Propose for merging

No branches dependent on this one.

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

Trey Morris (community): Approve on 2011-07-22

Matt Dietz (community): Approve on 2011-07-22

Diff: 242 lines (+75/-17)

7 files modified

bin/nova-manage (+16/-6)
nova/db/sqlalchemy/migrate_repo/versions/035_secondary_dns.py (+38/-0)
nova/db/sqlalchemy/models.py (+2/-1)
nova/network/manager.py (+11/-5)
nova/tests/__init__.py (+2/-1)
nova/tests/api/openstack/test_versions.py (+2/-2)
nova/tests/test_network.py (+4/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #810092: Add ability to set DNS entires on network create

Wishlist

Fix Released

Link a bug report

Related blueprints

1307. By Jason Kölker on 2011-07-22

docstring update

1306. By Jason Kölker on 2011-07-22

pass in the right argument

1305. By Jason Kölker on 2011-07-22

merge trunk

1304. By Jason Kölker on 2011-07-22

default to None in the method signature

1303. By Jason Kölker on 2011-07-22

merge trunk

1302. By Jason Kölker on 2011-07-21

pep8

1301. By Jason Kölker on 2011-07-21

add in the right number of fields

1300. By Jason Kölker on 2011-07-21

merge trunk

1299. By Jason Kölker on 2011-07-21

rename in preperation for trunk merge

1298. By Jason Kölker on 2011-07-21

only include dns entries if they are not None in the database