]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #3549 from Ved-vampir/master
authorSage Weil <sage@redhat.com>
Mon, 2 Feb 2015 10:55:39 +0000 (02:55 -0800)
committerSage Weil <sage@redhat.com>
Mon, 2 Feb 2015 10:55:39 +0000 (02:55 -0800)
Ceph: Fix

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/osd_types.cc
src/osd/osd_types.h

Simple merge
Simple merge