]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #8214 from athanatos/wip-feature-bits
authorSage Weil <sage@redhat.com>
Mon, 21 Mar 2016 11:35:27 +0000 (07:35 -0400)
committerSage Weil <sage@redhat.com>
Mon, 21 Mar 2016 11:35:27 +0000 (07:35 -0400)
Deprecate or free up a bunch of feature bits

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

diff --cc src/ceph_osd.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
Simple merge
Simple merge