git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff

projects / ceph.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12c2b7f ef4e4c8)

author	Sage Weil <sage@inktank.com>
	Thu, 15 Nov 2012 17:48:25 +0000 (09:48 -0800)
committer	Sage Weil <sage@inktank.com>
	Thu, 15 Nov 2012 17:48:25 +0000 (09:48 -0800)

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

		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

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