]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge commit 'v0.33'
authorSage Weil <sage@newdream.net>
Wed, 17 Aug 2011 17:47:02 +0000 (10:47 -0700)
committerSage Weil <sage@newdream.net>
Wed, 17 Aug 2011 17:47:02 +0000 (10:47 -0700)
1  2 
src/osd/osd_types.h

Simple merge