[Pkg-ceph-commits] [ceph] 02/03: Merge tag 'upstream/10.2.0' into ubuntu-xenial
James Downing Page
jamespage at moszumanska.debian.org
Fri Apr 22 10:23:37 UTC 2016
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch ubuntu-xenial
in repository ceph.
commit c44181c86256b45cac77ca7b39dee8425be11ba3
Merge: ba99ba5 cef0bf7
Author: James Page <james.page at ubuntu.com>
Date: Thu Apr 21 19:53:17 2016 +0100
Merge tag 'upstream/10.2.0' into ubuntu-xenial
Upstream version 10.2.0
AUTHORS | 9 +-
ChangeLog | 193 +++++++++++++++++++-
ceph.spec | 3 +-
ceph.spec.in | 1 +
configure | 20 +-
configure.ac | 2 +-
doc/man/8/ceph-deploy.rst | 2 +-
man/ceph-authtool.8 | 2 +-
man/ceph-clsinfo.8 | 2 +-
man/ceph-conf.8 | 2 +-
man/ceph-create-keys.8 | 2 +-
man/ceph-debugpack.8 | 2 +-
man/ceph-dencoder.8 | 2 +-
man/ceph-deploy.8 | 4 +-
man/ceph-detect-init.8 | 2 +-
man/ceph-disk.8 | 2 +-
man/ceph-fuse.8 | 2 +-
man/ceph-mds.8 | 2 +-
man/ceph-mon.8 | 2 +-
man/ceph-osd.8 | 2 +-
man/ceph-post-file.8 | 2 +-
man/ceph-rbdnamer.8 | 2 +-
man/ceph-rest-api.8 | 2 +-
man/ceph-run.8 | 2 +-
man/ceph-syn.8 | 2 +-
man/ceph.8 | 2 +-
man/cephfs.8 | 2 +-
man/crushtool.8 | 2 +-
man/librados-config.8 | 2 +-
man/monmaptool.8 | 2 +-
man/mount.ceph.8 | 2 +-
man/osdmaptool.8 | 2 +-
man/rados.8 | 2 +-
man/radosgw-admin.8 | 2 +-
man/radosgw.8 | 2 +-
man/rbd-fuse.8 | 2 +-
man/rbd-mirror.8 | 2 +-
man/rbd-nbd.8 | 2 +-
man/rbd-replay-many.8 | 2 +-
man/rbd-replay-prep.8 | 2 +-
man/rbd-replay.8 | 2 +-
man/rbd.8 | 2 +-
man/rbdmap.8 | 2 +-
.../erasure-code/encode-decode-non-regression.sh | 2 +-
src/.git_version | 4 +-
src/Makefile.am | 6 +
src/Makefile.in | 8 +
src/common/WeightedPriorityQueue.h | 178 +++++++++++++-----
src/common/WorkQueue.h | 5 +
src/common/buffer.cc | 15 +-
src/common/cohort_lru.h | 2 +
src/common/config_opts.h | 4 +
src/include/buffer.h | 2 +
src/include/rados/buffer.h | 2 +
src/init-ceph.in | 10 +
src/journal/JournalPlayer.cc | 15 +-
src/journal/JournalPlayer.h | 10 +-
src/journal/ObjectPlayer.cc | 32 +++-
src/librbd/AioImageRequestWQ.cc | 81 ++++++---
src/librbd/AioImageRequestWQ.h | 3 +
src/librbd/ExclusiveLock.cc | 87 ++++++---
src/librbd/ExclusiveLock.h | 5 +-
src/librbd/ImageWatcher.cc | 20 +-
src/librbd/Operations.cc | 24 ++-
src/librbd/exclusive_lock/ReleaseRequest.cc | 44 ++---
src/librbd/exclusive_lock/ReleaseRequest.h | 10 +-
src/librbd/image/CloseRequest.cc | 21 ++-
src/librbd/image/RefreshRequest.cc | 60 +++++-
src/librbd/image/RefreshRequest.h | 8 +
src/librbd/internal.cc | 15 ++
src/mds/FSMap.cc | 6 +-
src/msg/async/AsyncConnection.cc | 32 ++--
src/msg/async/AsyncConnection.h | 9 +-
src/msg/simple/DispatchQueue.cc | 9 +
src/msg/xio/XioConnection.cc | 62 +++----
src/msg/xio/XioConnection.h | 4 +-
src/msg/xio/XioMessenger.cc | 6 +-
src/msg/xio/XioPortal.h | 6 +-
src/os/bluestore/BlueStore.cc | 35 ++--
src/os/filestore/LFNIndex.cc | 4 +-
src/osd/OSD.cc | 38 +++-
src/osd/ReplicatedPG.cc | 8 +-
src/osd/ReplicatedPG.h | 2 +-
src/osd/Watch.cc | 14 +-
src/osd/Watch.h | 5 +-
src/pybind/Makefile.am | 3 +
src/pybind/cephfs/setup.py | 1 -
src/pybind/rados/rados.pyx | 12 +-
src/pybind/rados/setup.py | 1 -
src/pybind/rbd/setup.py | 1 -
src/rgw/rgw_acl_s3.cc | 2 +-
src/rgw/rgw_admin.cc | 67 +++++--
src/rgw/rgw_common.h | 4 +
src/rgw/rgw_coroutine.cc | 18 ++
src/rgw/rgw_coroutine.h | 15 +-
src/rgw/rgw_cors_s3.cc | 2 +-
src/rgw/rgw_cr_rados.cc | 6 +-
src/rgw/rgw_cr_rados.h | 31 ++--
src/rgw/rgw_cr_rest.h | 14 ++
src/rgw/rgw_file.cc | 201 ++++++++++++++++-----
src/rgw/rgw_file.h | 126 +++++++++++--
src/rgw/rgw_op.cc | 59 +++---
src/rgw/rgw_op.h | 27 ++-
src/rgw/rgw_rados.cc | 48 ++---
src/rgw/rgw_rados.h | 17 +-
src/rgw/rgw_realm_reloader.cc | 4 +
src/rgw/rgw_realm_watcher.cc | 7 +-
src/rgw/rgw_rest_conn.cc | 6 +-
src/rgw/rgw_rest_log.cc | 22 ++-
src/rgw/rgw_rest_s3.cc | 67 ++++---
src/rgw/rgw_sync.h | 2 -
src/rgw/rgw_user.h | 2 +
src/test/bufferlist.cc | 18 ++
src/test/centos-6/ceph.spec.in | 1 +
src/test/centos-7/ceph.spec.in | 1 +
src/test/ceph_objectstore_tool.py | 91 +++++-----
src/test/cephtool-test-mds.sh | 6 +-
src/test/cephtool-test-mon.sh | 6 +-
src/test/cephtool-test-osd.sh | 6 +-
src/test/cephtool-test-rados.sh | 4 +-
src/test/common/test_async_compressor.cc | 4 +
src/test/common/test_blkdev.cc | 18 +-
src/test/common/test_weighted_priority_queue.cc | 38 ++++
src/test/compressor/test_compression_plugin.cc | 16 +-
.../compressor/test_compression_plugin_snappy.cc | 11 +-
.../compressor/test_compression_plugin_zlib.cc | 12 +-
src/test/compressor/test_compression_snappy.cc | 4 +-
src/test/compressor/test_compression_zlib.cc | 9 +-
src/test/encoding/check-generated.sh | 36 ++--
src/test/encoding/readable.sh | 10 +-
src/test/erasure-code/TestErasureCode.cc | 5 +-
src/test/erasure-code/TestErasureCodeExample.cc | 5 +-
src/test/erasure-code/TestErasureCodeIsa.cc | 5 +-
src/test/erasure-code/TestErasureCodeJerasure.cc | 5 +-
src/test/erasure-code/TestErasureCodeLrc.cc | 13 +-
src/test/erasure-code/TestErasureCodePlugin.cc | 8 +-
src/test/erasure-code/TestErasureCodePluginIsa.cc | 5 +-
.../erasure-code/TestErasureCodePluginJerasure.cc | 5 +-
src/test/erasure-code/TestErasureCodePluginLrc.cc | 5 +-
src/test/erasure-code/TestErasureCodePluginShec.cc | 5 +-
src/test/erasure-code/TestErasureCodeShec.cc | 5 +-
src/test/erasure-code/TestErasureCodeShec_all.cc | 5 +-
.../erasure-code/TestErasureCodeShec_arguments.cc | 5 +-
.../erasure-code/TestErasureCodeShec_thread.cc | 5 +-
src/test/erasure-code/ceph_erasure_code.cc | 4 +-
.../ceph_erasure_code_non_regression.cc | 5 +-
src/test/erasure-code/test-erasure-code.sh | 82 ++++-----
src/test/erasure-code/test-erasure-eio.sh | 26 +--
src/test/fedora-21/ceph.spec.in | 1 +
src/test/librados_test_stub/TestClassHandler.cc | 8 +-
src/test/libradosstriper/rados-striper.sh | 2 +-
.../exclusive_lock/test_mock_ReleaseRequest.cc | 5 +-
src/test/librbd/image/test_mock_RefreshRequest.cc | 14 ++
src/test/librbd/journal/test_Replay.cc | 27 ++-
src/test/librgw_file_nfsns.cc | 12 +-
src/test/mon/misc.sh | 2 +-
src/test/mon/mkfs.sh | 32 ++--
src/test/mon/mon-created-time.sh | 8 +-
src/test/mon/mon-handle-forward.sh | 18 +-
src/test/mon/mon-ping.sh | 4 +-
src/test/mon/mon-scrub.sh | 4 +-
src/test/mon/osd-crush.sh | 130 ++++++-------
src/test/mon/osd-erasure-code-profile.sh | 92 +++++-----
src/test/mon/osd-pool-create.sh | 144 +++++++--------
src/test/opensuse-13.2/ceph.spec.in | 1 +
src/test/osd/TestRados.cc | 5 +-
src/test/osd/osd-bench.sh | 18 +-
src/test/osd/osd-config.sh | 26 +--
src/test/osd/osd-copy-from.sh | 20 +-
src/test/osd/osd-markdown.sh | 15 +-
src/test/osd/osd-reactivate.sh | 2 +-
src/test/osd/osd-reuse-id.sh | 2 +-
src/test/osd/osd-scrub-repair.sh | 2 +-
src/test/osd/osd-scrub-snaps.sh | 2 +-
src/test/pybind/test_ceph_argparse.py | 3 +-
src/test/rbd_mirror/image_replay.cc | 5 +-
src/test/test-ceph-helpers.sh | 2 +-
src/test/test_objectstore_memstore.sh | 2 +-
src/test/test_pidfile.sh | 2 +-
src/tools/ceph-monstore-update-crush.sh | 16 +-
src/tools/rbd/Utils.cc | 58 +++++-
src/tools/rbd/Utils.h | 12 +-
src/tools/rbd/action/BenchWrite.cc | 4 +-
src/tools/rbd/action/Children.cc | 2 +-
src/tools/rbd/action/Clone.cc | 4 +-
src/tools/rbd/action/Copy.cc | 5 +-
src/tools/rbd/action/Create.cc | 2 +-
src/tools/rbd/action/Diff.cc | 3 +-
src/tools/rbd/action/DiskUsage.cc | 2 +-
src/tools/rbd/action/Export.cc | 3 +-
src/tools/rbd/action/ExportDiff.cc | 3 +-
src/tools/rbd/action/Feature.cc | 2 +-
src/tools/rbd/action/Flatten.cc | 2 +-
src/tools/rbd/action/ImageMeta.cc | 8 +-
src/tools/rbd/action/Import.cc | 6 +-
src/tools/rbd/action/ImportDiff.cc | 2 +-
src/tools/rbd/action/Info.cc | 3 +-
src/tools/rbd/action/Kernel.cc | 5 +-
src/tools/rbd/action/Lock.cc | 6 +-
src/tools/rbd/action/MirrorImage.cc | 8 +-
src/tools/rbd/action/Nbd.cc | 3 +-
src/tools/rbd/action/ObjectMap.cc | 3 +-
src/tools/rbd/action/Remove.cc | 2 +-
src/tools/rbd/action/Rename.cc | 4 +-
src/tools/rbd/action/Resize.cc | 2 +-
src/tools/rbd/action/Snap.cc | 20 +-
src/tools/rbd/action/Status.cc | 2 +-
src/tools/rbd/action/Watch.cc | 2 +-
src/unittest_bufferlist.sh | 2 +-
src/vstart.sh | 10 +
systemd/ceph-mds at .service | 3 +
systemd/ceph-mon at .service | 3 +
systemd/ceph-osd at .service | 3 +
systemd/ceph-radosgw at .service | 3 +
214 files changed, 2264 insertions(+), 1035 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