From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Tue, 14 Mar 2017 16:10:00 +0000 (-0400)
Subject: Merge pull request #13900 from oritwas/wip-rgw-19231
X-Git-Tag: v12.0.1~85
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=849589d917d26d6bd817824e6fb3cd3bc506a163;p=ceph-ci.git

Merge pull request #13900 from oritwas/wip-rgw-19231

fix upgrate from hammer when zone doesn't have zoneparams

Reviewed-by: Casey Bodley <cbodley@redhat.com>
---

849589d917d26d6bd817824e6fb3cd3bc506a163