]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 65b7543 e0e348e)
Merge PR #18223 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 10 Oct 2017 21:33:59 +0000 (14:33 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 10 Oct 2017 21:33:59 +0000 (14:33 -0700)
* refs/pull/18223/head:
githubmap: define merge conflict resolution

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

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