]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-4273'
authorDavid Zafman <david.zafman@inktank.com>
Fri, 10 May 2013 23:44:19 +0000 (16:44 -0700)
committerDavid Zafman <david.zafman@inktank.com>
Fri, 10 May 2013 23:45:34 +0000 (16:45 -0700)
commitea0e0c7e34f6b99ecb123d0ee761f653e7e6bc04
tree2df957c71bf1d6f13b8fc0f1bbb9244e11e27048
parent7b408537c4986153a54dc090f8872f72904f5d4d
parent00e903160b33fe0a2195fe9c86ed24350944bdea
Merge branch 'wip-4273'

Reviewed-by: Sam Just <sam.just@inktank.com>
src/osd/OSD.cc
src/osd/OSD.h
src/osd/PG.cc
src/osd/PG.h