Merge "Use comma_delimited_list for token flush cron time settings" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Thu, 20 Apr 2017 21:30:10 +0000 (21:30 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 20 Apr 2017 21:30:10 +0000 (21:30 +0000)

Trivial merge