From: Nathan Cutler <ncutler@suse.com>
Date: Tue, 14 Mar 2017 00:26:23 +0000 (+0100)
Subject: tests: fix merge error in rgw/singleton/all/radosgw-admin.yaml
X-Git-Tag: v10.2.7~26^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d0a0d2f4bf1dacf7c1f38b968be84a5e905554a8;p=ceph.git

tests: fix merge error in rgw/singleton/all/radosgw-admin.yaml

Introduced by 94d5888c

Reported-by: Robin H. Johnson <robin.johnson@dreamhost.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/qa/suites/rgw/singleton/all/radosgw-admin.yaml b/qa/suites/rgw/singleton/all/radosgw-admin.yaml
index e63d3ec73ad3..0c41e12411b6 100644
--- a/qa/suites/rgw/singleton/all/radosgw-admin.yaml
+++ b/qa/suites/rgw/singleton/all/radosgw-admin.yaml
@@ -4,7 +4,6 @@ openstack:
 - volumes: # attached to each instance
     count: 4
     size: 10 # GB
->>>>>>> 8af4c35f95... qa/suites/rgw: Add openstack volume configuration
 tasks:
 - install:
 - ceph: