[Pkg-ceph-commits] [ceph] 50/59: Merge tag 'upstream/12.2.0' into ubuntu/artful

James Downing Page jamespage at moszumanska.debian.org
Thu Feb 1 15:27:57 UTC 2018


This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch ubuntu/artful
in repository ceph.

commit 853c3b0cbc048512499e039a6ced73cf92c17d42
Merge: 9027aa5 bf3c31e
Author: James Page <james.page at ubuntu.com>
Date:   Wed Aug 30 10:02:22 2017 +0000

    Merge tag 'upstream/12.2.0' into ubuntu/artful
    
    Upstream version 12.2.0

 CMakeLists.txt                                     |   4 +-
 alpine/APKBUILD                                    |   6 +-
 ceph.spec                                          |   8 +-
 ceph.spec.in                                       |   2 +
 cmake/modules/FindLZ4.cmake                        |  21 +-
 doc/ceph-volume/index.rst                          |  30 +
 doc/ceph-volume/intro.rst                          |  19 +
 doc/ceph-volume/lvm/activate.rst                   |  74 +++
 doc/ceph-volume/lvm/index.rst                      |  24 +
 doc/ceph-volume/lvm/prepare.rst                    | 145 +++++
 doc/ceph-volume/lvm/scan.rst                       |   9 +
 doc/ceph-volume/lvm/systemd.rst                    |  46 ++
 doc/conf.py                                        |   2 +
 doc/dev/ceph-volume/index.rst                      |  13 +
 doc/dev/ceph-volume/lvm.rst                        | 127 +++++
 doc/dev/ceph-volume/plugins.rst                    |  65 +++
 doc/dev/ceph-volume/systemd.rst                    |  37 ++
 doc/dev/index-old.rst                              |   1 +
 doc/glossary.rst                                   |  77 ++-
 doc/index.rst                                      |   1 +
 doc/install/manual-deployment.rst                  | 128 ++---
 doc/man/8/CMakeLists.txt                           |   2 +
 doc/man/8/ceph-volume-systemd.rst                  |  56 ++
 doc/man/8/ceph-volume.rst                          | 122 +++++
 doc/man/8/ceph.rst                                 |  14 +-
 doc/mgr/administrator.rst                          |   3 +-
 doc/rados/command/list-inconsistent-obj.json       |  14 +-
 doc/rados/man/index.rst                            |   2 +
 doc/rbd/rbd-mirroring.rst                          |   7 +
 qa/machine_types/schedule_subset.sh                |  12 +-
 qa/run-standalone.sh                               | 114 +++-
 qa/standalone/README                               |  11 +-
 qa/standalone/ceph-helpers.sh                      |  97 +++-
 qa/standalone/erasure-code/test-erasure-code.sh    |  14 +-
 qa/standalone/erasure-code/test-erasure-eio.sh     |  22 +-
 qa/standalone/misc/test-ceph-helpers.sh            |   2 +-
 qa/standalone/mon/misc.sh                          |   4 +-
 qa/standalone/mon/mon-bind.sh                      |   2 +-
 qa/standalone/mon/osd-erasure-code-profile.sh      |   2 +-
 qa/standalone/mon/test_pool_quota.sh               |   2 +-
 qa/standalone/osd/osd-dup.sh                       |   4 +-
 qa/standalone/scrub/osd-recovery-scrub.sh          | 129 +++++
 qa/standalone/scrub/osd-scrub-repair.sh            | 604 ++++++++++++++-------
 qa/standalone/scrub/osd-scrub-snaps.sh             |  12 +-
 qa/standalone/special/test-failure.sh              |  48 ++
 qa/suites/powercycle/osd/whitelist_health.yaml     |   1 +
 .../jewel-x-singleton/1-jewel-install/jewel.yaml   |   2 +
 .../upgrade/jewel-x/parallel/0-cluster/start.yaml  |   4 +-
 .../jewel-x/parallel/1-jewel-install/jewel.yaml    |   1 +
 .../parallel/2-workload/rados_loadgenbig.yaml      |  11 -
 .../stress-split/1-jewel-install/jewel.yaml        |   2 +
 qa/tasks/ceph_deploy.py                            |   4 +-
 qa/tasks/rgw.py                                    |   6 +-
 qa/tasks/rgw_multisite.py                          |   4 +-
 qa/tasks/util/rados.py                             |  18 +-
 qa/workunits/mon/crush_ops.sh                      |  14 +
 qa/workunits/rbd/rbd_mirror.sh                     |  18 +
 qa/workunits/rbd/rbd_mirror_helpers.sh             |  10 +
 src/.git_version                                   |   4 +-
 src/ceph-volume/ceph_volume/devices/lvm/api.py     | 118 ++--
 src/ceph-volume/ceph_volume/devices/lvm/common.py  |   6 +-
 src/ceph-volume/ceph_volume/devices/lvm/create.py  |  18 +-
 src/ceph-volume/ceph_volume/devices/lvm/prepare.py | 109 ++--
 src/ceph-volume/ceph_volume/systemd/main.py        |   1 -
 .../ceph_volume/tests/devices/lvm/test_api.py      |  43 +-
 .../ceph_volume/tests/devices/lvm/test_prepare.py  |  15 +
 .../tests/functional/centos7/create/group_vars/all |   4 +-
 .../tests/functional/xenial/create/group_vars/all  |   4 +-
 .../ceph_volume/tests/util/test_arg_validators.py  |  24 +
 src/ceph-volume/ceph_volume/util/arg_validators.py |  29 +
 src/ceph_mgr.cc                                    |   3 +
 src/client/Client.cc                               |  10 +-
 src/client/Client.h                                |   1 +
 src/client/fuse_ll.cc                              |  11 +-
 src/cls/log/cls_log.cc                             |   4 +-
 src/common/AsyncReserver.h                         |  10 +
 src/common/LogClient.cc                            |  19 +-
 src/common/LogClient.h                             |   2 +-
 src/common/ipaddr.cc                               |  10 +-
 src/common/options.cc                              |   2 +-
 src/common/pick_address.cc                         |  31 +-
 src/common/pick_address.h                          |   6 +
 src/common/scrub_types.cc                          |  13 +-
 src/common/scrub_types.h                           |   6 +-
 src/compressor/Compressor.cc                       |   4 +
 src/compressor/Compressor.h                        |   2 +
 src/crush/CrushCompiler.cc                         |  13 +-
 src/crush/CrushWrapper.cc                          |  96 +++-
 src/crush/CrushWrapper.h                           |   4 +
 src/include/ipaddr.h                               |   2 +-
 src/include/rados/rados_types.hpp                  |   9 +-
 src/mds/MDSDaemon.cc                               |  40 +-
 src/messages/MStatfs.h                             |   4 +-
 src/mon/FSCommands.cc                              |  13 +-
 src/mon/MonCommands.h                              |   9 +
 src/mon/Monitor.cc                                 |   9 +-
 src/mon/OSDMonitor.cc                              | 102 +++-
 src/mon/PGMap.cc                                   |   9 +-
 src/mon/mon_types.h                                |  14 +-
 src/os/bluestore/BlueStore.cc                      |  86 ++-
 src/osd/OSD.cc                                     |  27 +-
 src/osd/OSDMapMapping.h                            |   2 +-
 src/osd/PG.cc                                      |  18 +-
 src/osd/PGBackend.cc                               |  81 +--
 src/osd/PrimaryLogPG.cc                            |   4 +
 src/pybind/mgr/dashboard/rbd_iscsi.py              |  19 +-
 src/rgw/rgw_auth_s3.cc                             |  18 +-
 src/rgw/rgw_op.cc                                  |   8 +-
 src/rgw/rgw_quota.cc                               |   3 +
 src/rgw/rgw_rest.cc                                |   2 +-
 src/test/CMakeLists.txt                            |   5 +-
 src/test/cli-integration/rbd/unmap.t               |   1 +
 src/test/test_ipaddr.cc                            |  34 +-
 src/tools/ceph_objectstore_tool.cc                 |  12 +-
 src/tools/rados/rados.cc                           |  13 +-
 .../image_replayer/CreateImageRequest.cc           |   2 +
 116 files changed, 2650 insertions(+), 751 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git



More information about the Pkg-ceph-commits mailing list