From: Zack Cerza Date: Tue, 14 Mar 2017 15:19:28 +0000 (-0600) Subject: Merge pull request #13952 from smithfarm/wip-fix-merge-error X-Git-Tag: v10.2.7~26 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce2e9897c08775cfbe318f637d61e07eb5433df5;p=ceph.git Merge pull request #13952 from smithfarm/wip-fix-merge-error tests: fix merge error in rgw/singleton/all/radosgw-admin.yaml --- ce2e9897c08775cfbe318f637d61e07eb5433df5