]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 656b5b6) | patch
tests: fix merge error in rgw/singleton/all/radosgw-admin.yaml 13952/head
authorNathan Cutler <ncutler@suse.com>
Tue, 14 Mar 2017 00:26:23 +0000 (01:26 +0100)
committerNathan Cutler <ncutler@suse.com>
Tue, 14 Mar 2017 00:26:23 +0000 (01:26 +0100)
commitd0a0d2f4bf1dacf7c1f38b968be84a5e905554a8
tree7d46d829dfa82df7d1f5a12b1d96f11704822f73tree | snapshot
parent656b5b63ed7c43bd014bcafd81b001959d5f089fcommit | diff
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>
qa/suites/rgw/singleton/all/radosgw-admin.yaml diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.