Merge "Use number for KeystoneCronTokenFlushMaxDelay instead of string"
authorJenkins <jenkins@review.openstack.org>
Wed, 9 Aug 2017 07:42:18 +0000 (07:42 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 9 Aug 2017 07:42:18 +0000 (07:42 +0000)

Trivial merge