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: a4d1927 51ffede)

author	Sage Weil <sage@inktank.com>
	Wed, 29 Jan 2014 15:22:19 +0000 (07:22 -0800)
committer	Sage Weil <sage@inktank.com>
	Wed, 29 Jan 2014 15:22:19 +0000 (07:22 -0800)
commit	75da9f1086ed59b8fe437f64f6025059cc879f75
tree	e50581080f56bd9e67c34e19d349d2bd7386916c	tree \| snapshot
parent	a4d1927b539f327ed602aadd5493ffc67c0adcc7	commit \| diff
parent	51ffede3e31c3c32f96cf87ddaeb221327c7f2a4	commit \| diff

Merge pull request #1148 from ceph/wip-7215-quorum-features

Add monitor quorum features

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

src/mon/OSDMonitor.cc

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