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

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

projects / ceph-ci.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ce9dfe8 da51582)

author	Sage Weil <sage@newdream.net>
	Mon, 10 Jul 2017 01:23:13 +0000 (20:23 -0500)
committer	GitHub <noreply@github.com>
	Mon, 10 Jul 2017 01:23:13 +0000 (20:23 -0500)
commit	5a197c5817f591fc514f55b9929982e90d90084e
tree	5165293384afdee015f6eea9db175b440976cbd6	tree \| snapshot
parent	ce9dfe8dddead77a2447327ea6e3c2bdf6339427	commit \| diff
parent	da51582b456d0d92b385cbfe2c268629a743eadd	commit \| diff

Merge pull request #16160 from xiexingguo/wip-misc2

mon, osd: misc fixes and cleanups

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

src/mon/Monitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.h	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.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.