]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #12156 from dachary/wip-17969-jewel
authorNathan Cutler <presnypreklad@gmail.com>
Wed, 1 Feb 2017 14:56:48 +0000 (15:56 +0100)
committerGitHub <noreply@github.com>
Wed, 1 Feb 2017 14:56:48 +0000 (15:56 +0100)
jewel: rgw: multisite upgrade from hammer -> jewel ignores rgw_region_root_pool

Reviewed-by: Nathan Cutler <ncutler@suse.com>
1  2 
src/common/config_opts.h
src/rgw/rgw_main.cc
src/rgw/rgw_rados.cc

Simple merge
Simple merge
Simple merge