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: eade36d da69756)

author	Sage Weil <sage@inktank.com>
	Fri, 9 Aug 2013 16:41:41 +0000 (09:41 -0700)
committer	Sage Weil <sage@inktank.com>
	Fri, 9 Aug 2013 16:41:41 +0000 (09:41 -0700)
commit	d5aa3a90a5888385caab88d8648c1defa1345633
tree	0fa98afefb6a8559601e24489ae348824c3ad548	tree \| snapshot
parent	eade36df24b31a1815edbd7bcffe919bfb2fb96f	commit \| diff
parent	da69756ce9b5da9b48b61ab45612a10bddd26d55	commit \| diff

Merge remote-tracking branch 'gh/wip-5648-c'

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

src/mon/AuthMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/PGMonitor.cc	diff1 \|	diff2 \|	blob \| history

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