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

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

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1d641d1 e42bf30)

author	Sage Weil <sage@redhat.com>
	Wed, 21 Feb 2018 16:23:48 +0000 (10:23 -0600)
committer	Sage Weil <sage@redhat.com>
	Wed, 21 Feb 2018 16:23:48 +0000 (10:23 -0600)
commit	db1ca7271e1aecf61be58914926b4bb4dd1379e7
tree	db62443aeba131182899ea9aa9050b30ed8e4eec	tree \| snapshot
parent	1d641d137b5282eafdf475c46472c1e0d0b509d2	commit \| diff
parent	e42bf30b4596b7c58dadfcb77e16f6a26de3bce9	commit \| diff

Merge PR #19342 into master

* refs/pull/19342/head:
osd: add 'ceph [tell|daemon] osd.id smart'

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

src/common/options.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	diff1 \|	diff2 \|	blob \| history

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