]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 22984ee 389ae67)
Merge pull request #4675 from ceph/wip-11622
authorYehuda Sadeh <yehuda@redhat.com>
Fri, 15 May 2015 18:29:53 +0000 (11:29 -0700)
committerYehuda Sadeh <yehuda@redhat.com>
Fri, 15 May 2015 18:29:53 +0000 (11:29 -0700)
rgw: merge manifests correctly when there's prefix override

Reviewed-by: Sage Weil <sage@redhat.com>

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