]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
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)
commit7feb6b28f03638cb0143f68d21878c8aa5a1694c
treee15d548408112d1d526cd4090099edbf3acd3daa
parent65b7543390c8ee2a797bc559a64c61e35dd77cf6
parente0e348eedf49f5f195f46e64d4caf34b5094b183
Merge PR #18223 into master

* refs/pull/18223/head:
githubmap: define merge conflict resolution

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