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: 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)
commit	0fb23cf8ced5bbd0d148302e2a09fc28c0cbf94c
tree	0d490cbd84389a1b6115f1513237fe94daa9e0b3	tree \| snapshot
parent	12c2b7fa20be6878bc0763404d2a5c648e5fadbc	commit \| diff
parent	ef4e4c8287077e33f17c3b4f3848d1db395126d2	commit \| diff

Merge remote-tracking branch 'gh/wip-3477' into next

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

src/mon/OSDMonitor.cc

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