]> 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: fb80f1b e845b7e)
Merge pull request #35188 from sebastian-philipp/octopus-backport-34745-34658-34814...
authorSebastian Wagner <sebastian.wagner@suse.com>
Tue, 2 Jun 2020 11:39:45 +0000 (13:39 +0200)
committerGitHub <noreply@github.com>
Tue, 2 Jun 2020 11:39:45 +0000 (13:39 +0200)
octopus: Batch backport May (2)

Reviewed-by: Tim Serong <tserong@suse.com>
1  2 
doc/man_index.rst patch | diff1 | diff2 | blob | history
qa/tasks/cephadm.py patch | diff1 | diff2 | blob | history

diff --cc doc/man_index.rst
Simple merge
diff --cc qa/tasks/cephadm.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.