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: 4dfa4dc 22eca41)

author	Sage Weil <sage@newdream.net>
	Mon, 13 Feb 2012 18:01:32 +0000 (10:01 -0800)
committer	Sage Weil <sage@newdream.net>
	Mon, 13 Feb 2012 18:01:32 +0000 (10:01 -0800)
commit	b1162a37d8c74d7bd3e712e159cd583744a580d3
tree	57972d07f5e7b38b076e3d9a7d81aed8a64f3cb1	tree \| snapshot
parent	4dfa4dc27d2bc4791492fabe7da65ef56b9b658d	commit \| diff
parent	22eca410054654467489bb711ef4ea94017b7991	commit \| diff

Merge remote-tracking branch 'gh/wip-mon-lag'

Reviewed-by: Sage Weil <sage@newdream.net>

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

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