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: adc7016 5141301)

author	Kefu Chai <tchaikov@gmail.com>
	Fri, 10 Jul 2015 07:59:35 +0000 (15:59 +0800)
committer	Kefu Chai <tchaikov@gmail.com>
	Fri, 10 Jul 2015 07:59:35 +0000 (15:59 +0800)
commit	7f1fb574608800c3e6aa12df6c7888acbf397a52
tree	365a1477433fe4330bbd1f598d50ab21508096ff	tree \| snapshot
parent	adc70161d14fc2b51e6c6f38580f76ff0067717a	commit \| diff
parent	51413011417b76f5ad2830d9f93fbfe78c77e467	commit \| diff

Merge pull request #4936 from ceph/wip-11975-hammer

mon crashes when "ceph osd tree 85 --format json"

Reviewed-by: Kefu Chai <kchai@redhat.com>

src/mon/OSDMonitor.cc

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