openstack/nova
Code Issues Proposed changes

Merge "Fix docstrings for sphinx"

Browse Source
This commit is contained in:
Jenkins
2016-01-25 15:45:14 +00:00
committed by Gerrit Code Review
parent c6c48b8bb7 813c6321ef
commit 6dec144eeb
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/source/threading.rst
View File

@@ -31,6 +31,7 @@ delays in the case that there is only a single green thread::
from eventlet import greenthread from eventlet import greenthread
... ...
greenthread.sleep(0) greenthread.sleep(0)
In current code, time.sleep(0）does the same thing as greenthread.sleep(0) if In current code, time.sleep(0）does the same thing as greenthread.sleep(0) if
time module is patched through eventlet.monkey_patch(). To be explicit, we recommend time module is patched through eventlet.monkey_patch(). To be explicit, we recommend
contributors use ``greenthread.sleep()`` instead of ``time.sleep()``. contributors use ``greenthread.sleep()`` instead of ``time.sleep()``.

5
nova/conf/opts.py
View File

@@ -17,10 +17,11 @@
This is the single point of entry to generate the sample configuration This is the single point of entry to generate the sample configuration
file for Nova. It collects all the necessary info from the other modules file for Nova. It collects all the necessary info from the other modules
in this package. It is assumed that: in this package. It is assumed that:
* every other module in this package has a 'list_opts' function which * every other module in this package has a 'list_opts' function which
return a dict where return a dict where
* the keys are strings which are the group names * the keys are strings which are the group names
* the value of each key is a list of config options for that group * the value of each key is a list of config options for that group
* the nova.conf package doesn't have further packages with config options * the nova.conf package doesn't have further packages with config options
* this module is only used in the context of sample file generation * this module is only used in the context of sample file generation
""" """