diff options
| author | Anne Gentle <anne@openstack.org> | 2011-01-03 16:14:18 -0600 |
|---|---|---|
| committer | Anne Gentle <anne@openstack.org> | 2011-01-03 16:14:18 -0600 |
| commit | dc2c64b7d7a8ebab8a8ddb69474fdce0086a7ec8 (patch) | |
| tree | a63c6cfc30ebe8ed08f0dc77bc40ded1af1f4eff /doc/source | |
| parent | d196ab33aef41ce33742734a65a394ae95b57759 (diff) | |
| download | nova-dc2c64b7d7a8ebab8a8ddb69474fdce0086a7ec8.tar.gz nova-dc2c64b7d7a8ebab8a8ddb69474fdce0086a7ec8.tar.xz nova-dc2c64b7d7a8ebab8a8ddb69474fdce0086a7ec8.zip | |
Fixing merge conflicts
Diffstat (limited to 'doc/source')
| -rw-r--r-- | doc/source/nova.concepts.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/source/nova.concepts.rst b/doc/source/nova.concepts.rst index 5d832d369..83d518e54 100644 --- a/doc/source/nova.concepts.rst +++ b/doc/source/nova.concepts.rst @@ -76,7 +76,7 @@ Nova is built on a shared-nothing, messaging-based architecture. All of the majo To achieve the shared-nothing property with multiple copies of the same component, Nova keeps all the cloud system state in a distributed data store. Updates to system state are written into this store, using atomic transactions when required. Requests for system state are read out of this store. In limited cases, the read results are cached within controllers for short periods of time (for example, the current list of system users.) .. note:: The database schema is available on the `OpenStack Wiki <http://wiki.openstack.org/NovaDatabaseSchema>`_. - + Concept: Storage ---------------- |