]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a251ea0 ed3782e)
Merge PR #37202 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sat, 19 Sep 2020 01:54:57 +0000 (18:54 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Sat, 19 Sep 2020 01:54:57 +0000 (18:54 -0700)
* refs/pull/37202/head:
mon: allow overriding the initial mon_host

Reviewed-by: Neha Ojha <nojha@redhat.com>
1  2 
PendingReleaseNotes patch | diff1 | diff2 | blob | history
src/common/options.cc patch | diff1 | diff2 | blob | history
src/mon/MonMap.cc patch | diff1 | diff2 | blob | history

diff --cc PendingReleaseNotes
Simple merge
diff --cc src/common/options.cc
Simple merge
diff --cc src/mon/MonMap.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.