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

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

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3c64784 0d20cae)

author	Sage Weil <sage@inktank.com>
	Mon, 23 Sep 2013 21:12:33 +0000 (14:12 -0700)
committer	Sage Weil <sage@inktank.com>
	Mon, 23 Sep 2013 21:12:33 +0000 (14:12 -0700)
commit	da42355a6d8ef7197ae6f9f3bef2eb6f9f8ca9cb
tree	e06ecc55343fa8f3a93035c6134a683ffa8fac1f	tree \| snapshot
parent	3c64784e3fcbd0530acf14c7e3b37cae4cd54a91	commit \| diff
parent	0d20cae0be701c5b6151a26ee5e4fe24d89aa20a	commit \| diff

Merge pull request #599 from ceph/wip-6323

mon: OSDMonitor: fix #6322 and #6323

Reviewed-by: Greg Farnum <greg@inktank.com>

src/mon/OSDMonitor.cc

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