]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 656b5b6 d0a0d2f)
Merge pull request #13952 from smithfarm/wip-fix-merge-error
authorZack Cerza <zack@cerza.org>
Tue, 14 Mar 2017 15:19:28 +0000 (09:19 -0600)
committerGitHub <noreply@github.com>
Tue, 14 Mar 2017 15:19:28 +0000 (09:19 -0600)
tests: fix merge error in rgw/singleton/all/radosgw-admin.yaml


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.