]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e1835a 3b6d603)
Merge PR #18512 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 15 Dec 2017 19:08:29 +0000 (11:08 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 15 Dec 2017 19:08:29 +0000 (11:08 -0800)
* refs/pull/18512/head:
mon,mgr,doc,test: standardize argument as role

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
doc/man/8/ceph.rst patch | diff1 | diff2 | blob | history
src/mgr/DaemonServer.cc patch | diff1 | diff2 | blob | history
src/mon/MonCommands.h patch | diff1 | diff2 | blob | history

diff --cc doc/man/8/ceph.rst
Simple merge
diff --cc src/mgr/DaemonServer.cc
Simple merge
diff --cc src/mon/MonCommands.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.