openstack/openstack-helm
Code Issues Proposed changes

bugfix merge issue

Browse Source
This commit is contained in:
Alan Meadows 2017-03-22 12:26:23 -07:00
parent b28ef72c17
commit b6bfe640f2
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
keystone/templates/etc/_keystone.conf.tpl
View File

@ -135,7 +135,6 @@
# From keystone # From keystone
# #
<<<<<<< HEAD
# Using this feature is *NOT* recommended. Instead, use the `keystone-manage # Using this feature is *NOT* recommended. Instead, use the `keystone-manage
# bootstrap` command. The value of this option is treated as a "shared secret" # bootstrap` command. The value of this option is treated as a "shared secret"
# that can be used to bootstrap Keystone through the API. This "token" does not # that can be used to bootstrap Keystone through the API. This "token" does not