]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #12486 from dillaman/wip-18247
authorMykola Golub <mgolub@mirantis.com>
Fri, 16 Dec 2016 19:15:02 +0000 (21:15 +0200)
committerGitHub <noreply@github.com>
Fri, 16 Dec 2016 19:15:02 +0000 (21:15 +0200)
librbd: keep rbd_default_features setting as bitmask

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
1  2 
src/common/config_opts.h
src/tools/rbd/ArgumentTypes.cc

Simple merge
Simple merge