[Pkg-ceph-commits] [ceph] 01/02: Merge tag 'upstream/10.2.2' into ubuntu-xenial
James Downing Page
jamespage at moszumanska.debian.org
Thu Jun 16 11:07:54 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 3f2d83a00b3422597949c224bdd390b2de895152
Merge: 735d863 d10be6b
Author: James Page <james.page at ubuntu.com>
Date: Thu Jun 16 11:53:23 2016 +0100
Merge tag 'upstream/10.2.2' into ubuntu-xenial
Upstream version 10.2.2
AUTHORS | 5 +
ChangeLog | 201 ++++-
Makefile.am | 2 -
Makefile.in | 3 +-
ceph.spec | 350 +++------
ceph.spec.in | 348 +++------
configure | 20 +-
configure.ac | 2 +-
install-deps.sh | 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 | 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 | 867 ++++++++++++---------
src/ceph-disk/ceph_disk/main.py | 34 +-
src/ceph.in | 2 +-
src/client/Client.cc | 522 +++++++------
src/client/Client.h | 91 ++-
src/client/Dentry.h | 8 +-
src/client/Dir.h | 6 +-
src/client/Inode.h | 14 +-
src/client/MetaRequest.cc | 7 -
src/client/MetaRequest.h | 12 +-
src/cls/journal/cls_journal.cc | 117 ++-
src/cls/journal/cls_journal_client.cc | 2 -
src/cls/journal/cls_journal_types.h | 2 +
src/cls/rbd/cls_rbd.cc | 15 +-
src/cls/rbd/cls_rbd_client.cc | 83 +-
src/cls/rbd/cls_rbd_client.h | 10 +
src/common/Readahead.cc | 10 +
src/common/Readahead.h | 10 +
src/common/Throttle.cc | 13 +-
src/common/config_opts.h | 3 +-
src/common/hobject.cc | 6 +
src/common/hobject.h | 86 +-
src/erasure-code/Makefile.am | 2 +
src/global/Makefile.am | 4 +-
src/include/ceph_fs.h | 13 +
src/journal/AsyncOpTracker.cc | 33 +-
src/journal/AsyncOpTracker.h | 6 +
src/journal/FutureImpl.h | 3 +-
src/journal/JournalMetadata.cc | 197 ++++-
src/journal/JournalMetadata.h | 10 +-
src/journal/JournalPlayer.cc | 417 +++++++---
src/journal/JournalPlayer.h | 49 +-
src/journal/JournalRecorder.cc | 164 +++-
src/journal/JournalRecorder.h | 36 +-
src/journal/JournalTrimmer.cc | 18 +-
src/journal/JournalTrimmer.h | 6 +
src/journal/Journaler.cc | 82 +-
src/journal/Journaler.h | 2 +
src/journal/ObjectPlayer.cc | 70 +-
src/journal/ObjectPlayer.h | 16 +-
src/journal/ObjectRecorder.cc | 81 +-
src/journal/ObjectRecorder.h | 26 +-
src/journal/Utils.h | 24 +
src/librbd/AioCompletion.cc | 78 +-
src/librbd/AioCompletion.h | 38 +-
src/librbd/AioImageRequest.cc | 62 +-
src/librbd/AioImageRequest.h | 12 +-
src/librbd/AioImageRequestWQ.cc | 5 +-
src/librbd/AioObjectRequest.cc | 2 +-
src/librbd/ImageCtx.cc | 66 +-
src/librbd/ImageCtx.h | 4 +-
src/librbd/ImageState.cc | 26 +-
src/librbd/ImageState.h | 13 +-
src/librbd/Journal.cc | 262 ++++---
src/librbd/Journal.h | 32 +-
src/librbd/LibrbdWriteback.cc | 48 +-
src/librbd/LibrbdWriteback.h | 3 +-
src/librbd/Operations.cc | 8 +
src/librbd/TaskFinisher.h | 49 +-
src/librbd/exclusive_lock/AcquireRequest.cc | 34 +-
src/librbd/exclusive_lock/AcquireRequest.h | 57 +-
src/librbd/image/OpenRequest.cc | 95 ++-
src/librbd/image/OpenRequest.h | 65 +-
src/librbd/image/RefreshRequest.cc | 17 +-
src/librbd/image/RefreshRequest.h | 9 +-
src/librbd/internal.cc | 335 +++++---
src/librbd/internal.h | 22 +-
src/librbd/journal/Replay.cc | 33 +-
src/librbd/librbd.cc | 12 +-
src/librbd/operation/SnapshotRemoveRequest.cc | 9 +-
src/mds/CDentry.h | 2 +-
src/mds/CDir.cc | 15 +-
src/mds/CDir.h | 13 +-
src/mds/MDCache.cc | 3 +
src/mds/Server.cc | 58 +-
src/mds/mdstypes.h | 18 +-
src/mon/Monitor.cc | 12 +-
src/msg/simple/Pipe.cc | 8 +
src/os/bluestore/BlueStore.cc | 2 +-
src/osd/OSD.cc | 71 +-
src/osd/OSD.h | 9 +-
src/osd/OpRequest.cc | 1 +
src/osd/PG.cc | 18 +-
src/osd/PG.h | 2 +-
src/osd/ReplicatedPG.cc | 24 +-
src/osd/osd_types.cc | 2 +-
src/osdc/ObjectCacher.cc | 370 +++++----
src/osdc/ObjectCacher.h | 15 +-
src/osdc/Objecter.cc | 4 +-
src/osdc/Striper.cc | 3 +-
src/osdc/WritebackHandler.h | 3 +-
src/pybind/ceph_volume_client.py | 48 +-
src/pybind/rbd/rbd.pyx | 552 ++++++++++++-
src/rgw/rgw_admin.cc | 3 +-
src/rgw/rgw_op.h | 5 +-
src/rgw/rgw_rados.cc | 41 +-
src/rgw/rgw_rados.h | 19 +-
src/rgw/rgw_rest.cc | 3 -
src/test/Makefile-client.am | 9 +
src/test/centos-6/ceph.spec.in | 348 +++------
src/test/centos-6/install-deps.sh | 2 +-
src/test/centos-7/ceph.spec.in | 348 +++------
src/test/centos-7/install-deps.sh | 2 +-
src/test/cls_rbd/test_cls_rbd.cc | 67 ++
src/test/debian-jessie/install-deps.sh | 2 +-
src/test/erasure-code/Makefile.am | 56 +-
src/test/fedora-21/ceph.spec.in | 348 +++------
src/test/fedora-21/install-deps.sh | 2 +-
src/test/journal/RadosTestFixture.cc | 7 +
src/test/journal/RadosTestFixture.h | 2 +
src/test/journal/mock/MockJournaler.h | 8 +
src/test/journal/test_JournalMetadata.cc | 31 +-
src/test/journal/test_JournalPlayer.cc | 532 ++++++++++++-
src/test/journal/test_JournalRecorder.cc | 35 +
src/test/journal/test_JournalTrimmer.cc | 9 +-
src/test/journal/test_Journaler.cc | 8 +
src/test/journal/test_ObjectPlayer.cc | 11 +-
src/test/journal/test_ObjectRecorder.cc | 61 +-
src/test/libcephfs/test.cc | 48 +-
.../exclusive_lock/test_mock_AcquireRequest.cc | 71 ++
src/test/librbd/fsx.cc | 11 +
src/test/librbd/image/test_mock_RefreshRequest.cc | 62 +-
src/test/librbd/journal/test_Entries.cc | 1 +
src/test/librbd/journal/test_Replay.cc | 4 +-
src/test/librbd/journal/test_mock_Replay.cc | 25 +-
src/test/librbd/mock/MockImageState.h | 3 +
.../operation/test_mock_SnapshotRemoveRequest.cc | 31 +
src/test/librbd/test_librbd.cc | 16 -
src/test/librbd/test_mirroring.cc | 97 +++
src/test/librbd/test_mock_Journal.cc | 80 +-
src/test/librbd/test_support.cc | 18 +
src/test/librbd/test_support.h | 1 +
src/test/opensuse-13.2/ceph.spec.in | 348 +++------
src/test/opensuse-13.2/install-deps.sh | 2 +-
.../image_replayer/test_mock_BootstrapRequest.cc | 101 ++-
.../image_replayer/test_mock_CreateImageRequest.cc | 692 ++++++++++++++++
.../image_sync/test_mock_ImageCopyRequest.cc | 41 +-
.../image_sync/test_mock_SnapshotCopyRequest.cc | 117 ++-
.../image_sync/test_mock_SnapshotCreateRequest.cc | 138 +++-
.../image_sync/test_mock_SyncPointCreateRequest.cc | 3 +
src/test/rbd_mirror/random_write.cc | 214 +++++
src/test/rbd_mirror/test_ClusterWatcher.cc | 14 +-
src/test/rbd_mirror/test_ImageDeleter.cc | 471 +++++++++++
src/test/rbd_mirror/test_ImageReplayer.cc | 90 +--
src/test/rbd_mirror/test_ImageSync.cc | 8 +-
src/test/rbd_mirror/test_PoolWatcher.cc | 116 +--
src/test/rbd_mirror/test_fixture.cc | 20 +-
src/test/rbd_mirror/test_fixture.h | 2 +-
src/test/rbd_mirror/test_main.cc | 2 +
src/test/rbd_mirror/test_mock_ImageReplayer.cc | 46 +-
src/test/rbd_mirror/test_mock_ImageSync.cc | 90 ++-
src/test/ubuntu-12.04/install-deps.sh | 2 +-
src/test/ubuntu-14.04/install-deps.sh | 2 +-
src/tools/Makefile-client.am | 8 +
src/tools/rbd/action/Journal.cc | 58 +-
src/tools/rbd_mirror/BaseRequest.h | 42 +
src/tools/rbd_mirror/ClusterWatcher.cc | 33 +-
src/tools/rbd_mirror/ClusterWatcher.h | 18 +-
src/tools/rbd_mirror/ImageDeleter.cc | 570 ++++++++++++++
src/tools/rbd_mirror/ImageDeleter.h | 154 ++++
src/tools/rbd_mirror/ImageReplayer.cc | 705 ++++++++---------
src/tools/rbd_mirror/ImageReplayer.h | 77 +-
src/tools/rbd_mirror/ImageSync.cc | 143 ++--
src/tools/rbd_mirror/ImageSync.h | 24 +-
src/tools/rbd_mirror/Mirror.cc | 60 +-
src/tools/rbd_mirror/Mirror.h | 10 +-
src/tools/rbd_mirror/PoolWatcher.cc | 145 ++--
src/tools/rbd_mirror/PoolWatcher.h | 29 +-
src/tools/rbd_mirror/Replayer.cc | 380 +++++----
src/tools/rbd_mirror/Replayer.h | 58 +-
.../rbd_mirror/image_replayer/BootstrapRequest.cc | 167 ++--
.../rbd_mirror/image_replayer/BootstrapRequest.h | 12 +-
.../image_replayer/CreateImageRequest.cc | 437 +++++++++++
.../rbd_mirror/image_replayer/CreateImageRequest.h | 144 ++++
.../rbd_mirror/image_replayer/OpenImageRequest.cc | 100 +++
.../rbd_mirror/image_replayer/OpenImageRequest.h | 76 ++
.../image_replayer/ReplayStatusFormatter.cc | 3 +-
src/tools/rbd_mirror/image_replayer/Utils.h | 49 ++
.../rbd_mirror/image_sync/ImageCopyRequest.cc | 77 +-
src/tools/rbd_mirror/image_sync/ImageCopyRequest.h | 6 +-
.../rbd_mirror/image_sync/ObjectCopyRequest.cc | 91 +--
.../rbd_mirror/image_sync/SnapshotCopyRequest.cc | 225 ++++--
.../rbd_mirror/image_sync/SnapshotCopyRequest.h | 25 +-
.../rbd_mirror/image_sync/SnapshotCreateRequest.cc | 125 ++-
.../rbd_mirror/image_sync/SnapshotCreateRequest.h | 13 +-
.../image_sync/SyncPointCreateRequest.cc | 53 +-
.../rbd_mirror/image_sync/SyncPointCreateRequest.h | 6 +
.../rbd_mirror/image_sync/SyncPointPruneRequest.cc | 31 +-
src/tools/rbd_mirror/main.cc | 3 +
systemd/ceph-mds at .service | 4 +-
systemd/ceph-mon at .service | 4 +-
systemd/ceph-osd at .service | 4 +-
systemd/ceph-radosgw at .service | 4 +-
udev/60-ceph-partuuid-workaround.rules | 37 -
udev/95-ceph-osd-alt.rules | 5 -
241 files changed, 11007 insertions(+), 4991 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