commit 9b4856fc8336d4429d8bfa1076bd0268ef9dea55
author Jenkins <jenkins@review.openstack.org> Mon Apr 18 02:34:19 2016 +0000
committer Gerrit Code Review <review@openstack.org> Mon Apr 18 02:34:20 2016 +0000
tree 7bac8b916bc8dc625e70cd97f85d4e0c24d14f1e
parent fd33a08a88aeed1528349d5b710ff55afa1e13ad
parent 82bca44845b8dd25d34d5ee4b7c75d95c8ccf82c

Merge "Fix Q_PLUGIN_EXTRA_CONF_FILES usage comment"

lib/neutron-legacy

diff --git a/lib/neutron-legacy b/lib/neutron-legacy
index 084a356..c2729cb 100644
--- a/lib/neutron-legacy
+++ b/lib/neutron-legacy
@@ -946,10 +946,11 @@
 
     # Set plugin-specific variables ``Q_DB_NAME``, ``Q_PLUGIN_CLASS``.
     # For main plugin config file, set ``Q_PLUGIN_CONF_PATH``, ``Q_PLUGIN_CONF_FILENAME``.
-    # For addition plugin config files, set ``Q_PLUGIN_EXTRA_CONF_PATH``,
+    # For addition plugin config files, set ``Q_PLUGIN_EXTRA_CONF_PATH`` and
     # ``Q_PLUGIN_EXTRA_CONF_FILES``.  For example:
     #
-    #    ``Q_PLUGIN_EXTRA_CONF_FILES=(file1, file2)``
+    #    ``Q_PLUGIN_CONF_PATH=/path/to/plugins``
+    #    ``Q_PLUGIN_EXTRA_CONF_FILES=(file1 file2)``
     neutron_plugin_configure_common
 
     if [[ "$Q_PLUGIN_CONF_PATH" == '' || "$Q_PLUGIN_CONF_FILENAME" == '' || "$Q_PLUGIN_CLASS" == '' ]]; then