git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commit

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commit

projects / ceph-ci.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 72c63fe aadeaba)

author	Sage Weil <sage@redhat.com>
	Tue, 12 Nov 2019 15:42:03 +0000 (09:42 -0600)
committer	Sage Weil <sage@redhat.com>
	Tue, 12 Nov 2019 15:42:03 +0000 (09:42 -0600)
commit	4f54154598063d48eca1958b14921e27a8bd7920
tree	e4b3445ffcc10d44ca1d87410d03811530b55072	tree \| snapshot
parent	72c63fe228b5b7114dd679e8de922df8d9f14a2f	commit \| diff
parent	aadeaba4f49144ec3f075274392d6f50ace3794b	commit \| diff

Merge PR #31487 into master

* refs/pull/31487/head:
ceph-daemon: add `--base-dir` arg to `adopt` command

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

src/ceph-daemon/ceph-daemon

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