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: b05f7ea 7e72224)

author	Sage Weil <sage@inktank.com>
	Wed, 4 Sep 2013 17:43:04 +0000 (10:43 -0700)
committer	Sage Weil <sage@inktank.com>
	Wed, 4 Sep 2013 17:43:04 +0000 (10:43 -0700)
commit	6a4f4f0d7a48a5c673ba0fc494bbf042650a8f22
tree	2125229e8d549cd7d2c8053114c82e60e6a75d6f	tree \| snapshot
parent	b05f7ea5199fc190a3be887fac4d74417461e1ce	commit \| diff
parent	7e722245a717038c49f432ae19d9874c25066bb6	commit \| diff

Merge remote-tracking branch 'gh/wip-6047'

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

src/mon/OSDMonitor.cc

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