Fixes after trunk merge.

This commit is contained in:
Todd Willey
2010-11-02 20:31:17 -04:00
parent 3982c242c4
commit 69d1ad1616
2 changed files with 1 additions and 24 deletions

View File

@@ -34,14 +34,6 @@ The :mod:`context` Module
:undoc-members:
:show-inheritance:
The :mod:`crypto` Module
------------------------
.. automodule:: nova.crypto
:members:
:undoc-members:
:show-inheritance:
The :mod:`exception` Module
---------------------------
@@ -58,14 +50,6 @@ The :mod:`flags` Module
:undoc-members:
:show-inheritance:
The :mod:`manager` Module
-------------------------
.. automodule:: nova.manager
:members:
:undoc-members:
:show-inheritance:
The :mod:`process` Module
-------------------------
@@ -98,14 +82,6 @@ The :mod:`server` Module
:undoc-members:
:show-inheritance:
The :mod:`service` Module
-------------------------
.. automodule:: nova.service
:members:
:undoc-members:
:show-inheritance:
The :mod:`test` Module
----------------------

View File

@@ -24,6 +24,7 @@ flags.DECLARE('volume_driver', 'nova.volume.manager')
FLAGS.volume_driver = 'nova.volume.driver.FakeAOEDriver'
FLAGS.connection_type = 'fake'
FLAGS.fake_rabbit = True
flags.DECLARE('auth_driver', 'nova.auth.manager')
FLAGS.auth_driver = 'nova.auth.dbdriver.DbDriver'
flags.DECLARE('network_size', 'nova.network.manager')
flags.DECLARE('num_networks', 'nova.network.manager')