]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd_types: fix merge
authorSage Weil <sage@newdream.net>
Wed, 17 Aug 2011 17:47:39 +0000 (10:47 -0700)
committerSage Weil <sage@newdream.net>
Wed, 17 Aug 2011 17:47:39 +0000 (10:47 -0700)
commitcb1f05009d5d5a6c8806f1f9868092505f6b6c64
treec25b3438e61ce5ad02cf546c9b912974dfb697cc
parent46645936c58ed081eca2d08bd5ff3c3d787b209a
osd_types: fix merge

Signed-off-by: Sage Weil <sage@newdream.net>
src/osd/osd_types.h