]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #7846 from dillaman/wip-14551
authorJosh Durgin <jdurgin@redhat.com>
Wed, 2 Mar 2016 01:18:04 +0000 (17:18 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Wed, 2 Mar 2016 01:18:04 +0000 (17:18 -0800)
commita7470c80ec0d6f2837c351bd2c3964c5c774505a
tree6087c3910f642fba3118cc72614e767c8503d7c5
parent0c965e76d8c2f47ae6d926ca81895177664e4732
parentfeb2fc02404775bc262677a2d0434faec0348c53
Merge pull request #7846 from dillaman/wip-14551

rbd: update default image features

Conflicts:
PendingReleaseNotes (trivial)
PendingReleaseNotes
src/common/config_opts.h
src/test/cli/rbd/help.t
src/tools/rbd/ArgumentTypes.cc