Merge "Automatically backup and restore Swift rings from the undercloud" into stable...
authorJenkins <jenkins@review.openstack.org>
Fri, 17 Feb 2017 19:13:52 +0000 (19:13 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 17 Feb 2017 19:13:52 +0000 (19:13 +0000)

Trivial merge