diff options
| author | Yehuda Sadeh <yehuda@redhat.com> | 2015-01-22 23:19:22 +0100 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda@redhat.com> | 2015-01-22 23:19:22 +0100 |
| commit | b01ef218b690d356f878cf143f50d76e88450280 (patch) | |
| tree | f20bbb8f6b5597cd748246016936e95058e70b07 /src/fetch_config | |
| parent | rgw: set default value for swift versioning extension (diff) | |
| parent | Merge pull request #3460 from athanatos/wip-10524 (diff) | |
| download | ceph-b01ef218b690d356f878cf143f50d76e88450280.tar.xz ceph-b01ef218b690d356f878cf143f50d76e88450280.zip | |
Merge remote-tracking branch 'origin/master' into wip-rgw-versioning-4
Conflicts:
src/cls/rgw/cls_rgw_client.cc
src/cls/rgw/cls_rgw_client.h
src/rgw/rgw_bucket.cc
src/rgw/rgw_common.h
src/rgw/rgw_op.cc
src/rgw/rgw_rados.cc
src/rgw/rgw_rados.h
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Diffstat (limited to 'src/fetch_config')
0 files changed, 0 insertions, 0 deletions