Merge "Update etc/keystone.conf.sample"

This commit is contained in:
Jenkins 2016-08-06 00:20:47 +00:00 committed by Gerrit Code Review
commit 969d2fc703

File diff suppressed because it is too large Load Diff