Merge "Remove trailing whitespace"
authorJenkins <jenkins@review.openstack.org>
Thu, 22 Jun 2017 10:24:50 +0000 (10:24 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 22 Jun 2017 10:24:50 +0000 (10:24 +0000)

Trivial merge