Code review comment for lp://qastaging/~jason-koelker/nova/lp819477

Hi Jason,

I'm getting errors when using FlatDHCP w/ this branch (via Smokestack):

  InvalidRequestError: Object '<Subnet at 0x3840510>' is already attached to session

Paste stack trace available here:

  http://paste.openstack.org/show/2413/

---

Also. You have some conflicts to fix with the latest nova trunk:

Text conflict in bin/nova-manage
Text conflict in nova/db/api.py
Text conflict in nova/db/sqlalchemy/api.py
Text conflict in nova/db/sqlalchemy/models.py
Text conflict in nova/exception.py
Text conflict in nova/tests/test_network.py