[Pkg-ceph-commits] [ceph] 02/06: Merge tag 'upstream/10.2.1' into ubuntu-yakkety
James Downing Page
jamespage at moszumanska.debian.org
Mon Jun 6 08:25:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch ubuntu-yakkety
in repository ceph.
commit bc41112d05a1c6001487d98aa9d91cc16e158c13
Merge: d0e480c d14300e
Author: James Page <james.page at ubuntu.com>
Date: Wed May 25 15:08:31 2016 +0100
Merge tag 'upstream/10.2.1' into ubuntu-yakkety
Upstream version 10.2.1
AUTHORS | 6 +
ChangeLog | 152 ++++++-
ceph.spec | 305 +++++++++----
ceph.spec.in | 303 +++++++++----
configure | 20 +-
configure.ac | 2 +-
etc/default/ceph | 3 +
install-deps.sh | 4 +-
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 | 2 +-
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 +-
src/.git_version | 4 +-
src/Makefile.in | 210 ++++++---
src/ceph_mds.cc | 31 +-
src/cls/rbd/cls_rbd.cc | 476 ++++++++++++++++++-
src/cls/rbd/cls_rbd_client.cc | 158 +++++++
src/cls/rbd/cls_rbd_client.h | 34 ++
src/cls/rbd/cls_rbd_types.cc | 84 ++++
src/cls/rbd/cls_rbd_types.h | 54 +++
src/cls/rgw/cls_rgw.cc | 1 +
src/common/Readahead.cc | 4 +-
src/include/ceph_fs.h | 2 +-
src/include/rbd/librbd.h | 33 ++
src/include/rbd/librbd.hpp | 18 +
src/init-ceph.in | 5 +-
src/journal/Entry.cc | 9 +-
src/journal/Entry.h | 2 +
src/journal/JournalMetadata.h | 3 +
src/journal/JournalPlayer.cc | 7 +-
src/journal/JournalRecorder.cc | 2 +
src/journal/Journaler.cc | 4 +
src/journal/Journaler.h | 1 +
src/librbd/AioImageRequest.cc | 8 +-
src/librbd/AioImageRequestWQ.cc | 4 +-
src/librbd/AioImageRequestWQ.h | 2 +-
src/librbd/ExclusiveLock.cc | 22 +-
src/librbd/ExclusiveLock.h | 5 +
src/librbd/ImageState.cc | 7 +-
src/librbd/ImageWatcher.cc | 2 +-
src/librbd/Journal.cc | 86 +++-
src/librbd/Journal.h | 20 +-
src/librbd/ObjectMap.cc | 9 +-
src/librbd/ObjectMap.h | 3 +
src/librbd/Operations.cc | 263 ++++++-----
src/librbd/Operations.h | 2 +-
src/librbd/WatchNotifyTypes.h | 6 +-
src/librbd/exclusive_lock/AcquireRequest.cc | 56 ++-
src/librbd/exclusive_lock/AcquireRequest.h | 34 +-
src/librbd/image/OpenRequest.cc | 4 +-
src/librbd/image/RefreshParentRequest.cc | 13 +-
src/librbd/image/RefreshParentRequest.h | 26 +-
src/librbd/image/RefreshRequest.cc | 140 ++++--
src/librbd/image/RefreshRequest.h | 20 +-
src/librbd/image/SetSnapRequest.cc | 10 +-
src/librbd/image_watcher/NotifyLockOwner.cc | 2 +-
src/librbd/internal.cc | 237 ++++++++--
src/librbd/internal.h | 8 +
src/librbd/journal/Replay.cc | 21 +-
src/librbd/journal/Replay.h | 3 +-
src/librbd/journal/Types.h | 6 +-
src/librbd/librbd.cc | 125 ++++-
src/librbd/object_map/InvalidateRequest.cc | 1 +
src/librbd/object_map/RefreshRequest.cc | 42 +-
src/librbd/object_map/RefreshRequest.h | 40 +-
src/librbd/object_map/Request.cc | 2 +-
src/librbd/object_map/ResizeRequest.cc | 5 +-
src/librbd/object_map/UpdateRequest.cc | 6 +-
src/librbd/operation/FlattenRequest.cc | 5 +-
src/librbd/operation/RebuildObjectMapRequest.cc | 5 +-
src/librbd/operation/ResizeRequest.cc | 5 +-
src/librbd/operation/SnapshotCreateRequest.cc | 7 +-
src/librbd/operation/SnapshotCreateRequest.h | 4 +-
src/librbd/operation/SnapshotRollbackRequest.cc | 5 +-
src/librbd/operation/SnapshotUnprotectRequest.cc | 2 +-
src/librbd/operation/TrimRequest.cc | 5 +-
src/mds/Beacon.cc | 19 +-
src/mds/Beacon.h | 5 +-
src/mds/FSMap.cc | 36 +-
src/mds/MDSAuthCaps.cc | 2 +-
src/mds/MDSDaemon.cc | 62 +--
src/mds/MDSDaemon.h | 7 +-
src/mds/MDSMap.cc | 23 +-
src/mds/MDSMap.h | 22 +-
src/mds/MDSRank.cc | 13 +-
src/mds/MDSRank.h | 4 +-
src/messages/MMDSBeacon.h | 18 +-
src/mon/MDSMonitor.cc | 89 +---
src/mon/OSDMonitor.cc | 34 +-
src/objclass/class_api.cc | 23 +
src/objclass/objclass.h | 5 +
src/osd/OSDMap.cc | 4 +-
src/osdc/Objecter.cc | 16 +-
src/pybind/ceph_volume_client.py | 15 +-
src/rgw/rgw_admin.cc | 83 +++-
src/rgw/rgw_civetweb_frontend.cc | 13 +-
src/rgw/rgw_cr_rados.cc | 3 +
src/rgw/rgw_cr_rados.h | 55 ++-
src/rgw/rgw_cr_rest.h | 14 +
src/rgw/rgw_data_sync.cc | 80 ++--
src/rgw/rgw_data_sync.h | 3 +-
src/rgw/rgw_http_client.cc | 283 +++++++++---
src/rgw/rgw_http_client.h | 22 +-
src/rgw/rgw_http_errors.h | 2 +
src/rgw/rgw_op.cc | 27 +-
src/rgw/rgw_period_pusher.cc | 1 +
src/rgw/rgw_rados.cc | 210 +++++----
src/rgw/rgw_rados.h | 5 +-
src/rgw/rgw_rest_client.cc | 2 +-
src/rgw/rgw_rest_conn.cc | 4 -
src/rgw/rgw_rest_conn.h | 4 -
src/rgw/rgw_rest_s3.cc | 8 +
src/rgw/rgw_swift_auth.cc | 2 +-
src/rgw/rgw_sync.cc | 32 +-
src/test/Makefile-client.am | 21 +-
src/test/centos-6/ceph.spec.in | 303 +++++++++----
src/test/centos-6/install-deps.sh | 4 +-
src/test/centos-7/ceph.spec.in | 303 +++++++++----
src/test/centos-7/install-deps.sh | 4 +-
src/test/ceph_objectstore_tool.py | 23 +-
src/test/cli/crushtool/help.t | 2 +-
src/test/cli/radosgw-admin/help.t | 10 +-
src/test/cli/rbd/help.t | 37 ++
src/test/cls_rbd/test_cls_rbd.cc | 204 +++++++++
src/test/debian-jessie/install-deps.sh | 4 +-
src/test/fedora-21/ceph.spec.in | 303 +++++++++----
src/test/fedora-21/install-deps.sh | 4 +-
.../{rbd_mirror => journal}/mock/MockJournaler.cc | 1 +
src/test/journal/mock/MockJournaler.h | 267 +++++++++++
src/test/journal/test_JournalPlayer.cc | 49 ++
src/test/journal/test_JournalRecorder.cc | 9 +-
src/test/librados_test_stub/LibradosTestStub.cc | 24 +
.../exclusive_lock/test_mock_AcquireRequest.cc | 57 ++-
src/test/librbd/image/test_mock_RefreshRequest.cc | 45 +-
src/test/librbd/journal/test_Entries.cc | 3 +
src/test/librbd/journal/test_mock_Replay.cc | 2 +-
src/test/librbd/mock/MockImageCtx.h | 4 +
src/test/librbd/mock/MockImageState.h | 2 +
src/test/librbd/mock/MockJournal.cc | 10 +
src/test/librbd/mock/MockJournal.h | 18 +
src/test/librbd/mock/MockOperations.h | 5 +-
.../librbd/object_map/test_mock_RefreshRequest.cc | 41 ++
.../operation/test_mock_SnapshotCreateRequest.cc | 46 +-
src/test/librbd/test_librbd.cc | 11 +
src/test/librbd/test_mirroring.cc | 75 +++
src/test/librbd/test_mock_Journal.cc | 258 +++--------
src/test/mds/TestMDSAuthCaps.cc | 22 +
src/test/objectstore/test_kv.cc | 39 +-
src/test/opensuse-13.2/ceph.spec.in | 303 +++++++++----
src/test/opensuse-13.2/install-deps.sh | 4 +-
.../image_replayer/test_mock_BootstrapRequest.cc | 126 +++++
.../image_sync/test_mock_ImageCopyRequest.cc | 14 +-
.../image_sync/test_mock_ObjectCopyRequest.cc | 2 -
.../image_sync/test_mock_SnapshotCopyRequest.cc | 308 ++++++++++++-
.../image_sync/test_mock_SnapshotCreateRequest.cc | 189 ++++++++
.../image_sync/test_mock_SyncPointCreateRequest.cc | 14 +-
.../image_sync/test_mock_SyncPointPruneRequest.cc | 14 +-
src/test/rbd_mirror/mock/MockJournaler.h | 149 ------
src/test/rbd_mirror/test_ImageSync.cc | 82 +++-
src/test/rbd_mirror/test_fixture.cc | 8 +
src/test/rbd_mirror/test_mock_ImageReplayer.cc | 26 +-
src/test/rbd_mirror/test_mock_ImageSync.cc | 17 +-
src/test/ubuntu-12.04/install-deps.sh | 4 +-
src/test/ubuntu-14.04/install-deps.sh | 4 +-
src/tools/Makefile-client.am | 5 +
src/tools/crushtool.cc | 2 +-
src/tools/rbd/Shell.cc | 27 +-
src/tools/rbd/Shell.h | 4 +-
src/tools/rbd/Utils.cc | 49 +-
src/tools/rbd/Utils.h | 6 +-
src/tools/rbd/action/DiskUsage.cc | 32 +-
src/tools/rbd/action/Kernel.cc | 43 +-
src/tools/rbd/action/MirrorImage.cc | 68 +++
src/tools/rbd/action/MirrorPool.cc | 146 ++++++
src/tools/rbd_mirror/ImageReplayer.cc | 505 ++++++++++++++++++---
src/tools/rbd_mirror/ImageReplayer.h | 55 ++-
src/tools/rbd_mirror/ImageSync.cc | 42 +-
src/tools/rbd_mirror/ImageSync.h | 13 +-
src/tools/rbd_mirror/Mirror.cc | 117 ++++-
src/tools/rbd_mirror/Mirror.h | 4 +
src/tools/rbd_mirror/ProgressContext.h | 21 +
src/tools/rbd_mirror/Replayer.cc | 234 +++++++++-
src/tools/rbd_mirror/Replayer.h | 9 +
.../rbd_mirror/image_replayer/BootstrapRequest.cc | 55 ++-
.../rbd_mirror/image_replayer/BootstrapRequest.h | 16 +-
.../image_replayer/ReplayStatusFormatter.cc | 240 ++++++++++
.../image_replayer/ReplayStatusFormatter.h | 56 +++
.../rbd_mirror/image_sync/ImageCopyRequest.cc | 27 +-
src/tools/rbd_mirror/image_sync/ImageCopyRequest.h | 14 +-
.../rbd_mirror/image_sync/ObjectCopyRequest.cc | 79 ++--
.../rbd_mirror/image_sync/SnapshotCopyRequest.cc | 313 ++++++++++---
.../rbd_mirror/image_sync/SnapshotCopyRequest.h | 33 +-
.../rbd_mirror/image_sync/SnapshotCreateRequest.cc | 221 +++++++++
.../rbd_mirror/image_sync/SnapshotCreateRequest.h | 95 ++++
.../rbd_mirror/image_sync/SyncPointPruneRequest.cc | 2 +-
src/tools/rbd_nbd/rbd-nbd.cc | 12 +-
src/tools/setup-virtualenv.sh | 2 +-
systemd/50-ceph.preset | 5 +
systemd/Makefile.am | 3 +-
systemd/Makefile.in | 3 +-
systemd/ceph-osd at .service | 2 +-
233 files changed, 8398 insertions(+), 2173 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