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: 1ba1433 7802292)

author	Sage Weil <sage@inktank.com>
	Thu, 30 May 2013 22:04:21 +0000 (15:04 -0700)
committer	Sage Weil <sage@inktank.com>
	Thu, 30 May 2013 22:04:21 +0000 (15:04 -0700)
commit	3cc0f3d803c376167175dd9082dc24f76ee1bd7a
tree	b7f65d8959c133882f26880920e7713575c88277	tree \| snapshot
parent	1ba14336170ef4a65e3a873e478995e34b2d6064	commit \| diff
parent	7802292e0a49be607d7ba139b44d5ea1f98e07e6	commit \| diff

Merge pull request #335 from ceph/wip-5176

Reviewed-by: Samuel Just <sam.just@inktank.com>

src/mon/Paxos.cc

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