summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-14 20:44:52 +0000
committerGerrit Code Review <review@openstack.org>2015-04-14 20:44:52 +0000
commit583585086f6bbcbaada6ddf481424da9d24c3a95 (patch)
tree420b0ad8b4d145b3c1ac75f50988dd4d3e0e170d
parente910f7e07d05dd2c6ada939d5704c3d4944c24b0 (diff)
parent75e84543aab5af8038e0e1a369fcf0ed10ea2509 (diff)
downloadswift-583585086f6bbcbaada6ddf481424da9d24c3a95.tar.gz
Merge "Clarify the description of backward compatibility in Keystoneauth's docstring"
-rw-r--r--swift/common/middleware/keystoneauth.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/swift/common/middleware/keystoneauth.py b/swift/common/middleware/keystoneauth.py
index 09d559664..505024e69 100644
--- a/swift/common/middleware/keystoneauth.py
+++ b/swift/common/middleware/keystoneauth.py
@@ -106,9 +106,9 @@ class KeystoneAuth(object):
operator_roles
service_roles
- For backward compatibility, no prefix implies the parameter
- applies to all reseller_prefixes. Here is an example, using two
- prefixes::
+ For backward compatibility, if either of these parameters is specified
+ without a prefix then it applies to all reseller_prefixes. Here is an
+ example, using two prefixes::
reseller_prefix = AUTH, SERVICE
# The next three lines have identical effects (since the first applies