Merge "Wrong default in docstring"
authorJenkins <jenkins@review.openstack.org>
Wed, 9 Nov 2016 13:22:42 +0000 (13:22 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 9 Nov 2016 13:22:42 +0000 (13:22 +0000)

Trivial merge