[Pkg-ceph-commits] [ceph] 03/23: Merge tag 'upstream/10.0.2' into jewel

James Downing Page jamespage at moszumanska.debian.org
Wed Feb 17 10:42:00 UTC 2016


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

jamespage pushed a commit to branch jewel
in repository ceph.

commit 93adea61c80c502d4ab5786892823220c5d68533
Merge: 1e7de58 6f322e5
Author: James Page <james.page at ubuntu.com>
Date:   Mon Jan 25 15:12:49 2016 +0000

    Merge tag 'upstream/10.0.2' into jewel
    
    Upstream version 10.0.2

 AUTHORS                                            |   30 +-
 ChangeLog                                          |  457 +++-
 INSTALL                                            |   25 +-
 Makefile.in                                        |    2 +
 ceph.spec                                          |   39 +-
 ceph.spec.in                                       |   37 +-
 configure                                          |  206 +-
 configure.ac                                       |   48 +-
 doc/Makefile.am                                    |    1 +
 doc/Makefile.in                                    |    3 +
 doc/man/8/rbd-nbd.rst                              |   55 +
 doc/man/8/rbd.rst                                  |   44 +-
 man/Makefile-client.am                             |    1 +
 man/Makefile.in                                    |    3 +
 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-fuse.8 => rbd-nbd.8}                      |   48 +-
 man/rbd-replay-many.8                              |    2 +-
 man/rbd-replay-prep.8                              |    2 +-
 man/rbd-replay.8                                   |    2 +-
 man/rbd.8                                          |   45 +-
 selinux/Makefile.in                                |    2 +
 src/.git_version                                   |    4 +-
 src/Makefile-client.am                             |    2 -
 src/Makefile-env.am                                |   20 +-
 src/Makefile.am                                    |   19 +-
 src/Makefile.in                                    | 2233 ++++++++++++------
 src/acconfig.h.in                                  |   12 +
 src/auth/Crypto.cc                                 |    3 +-
 src/auth/cephx/CephxServiceHandler.cc              |   13 +-
 src/ceph-detect-init/Makefile.am                   |   10 +-
 src/ceph-detect-init/tests/test_all.py             |    3 +
 src/ceph-disk                                      |    4 +-
 src/ceph.in                                        |    4 +
 src/ceph_fuse.cc                                   |   28 +-
 src/ceph_mds.cc                                    |    6 +-
 src/ceph_osd.cc                                    |   56 +-
 src/client/Client.cc                               |  143 +-
 src/client/Client.h                                |    8 +-
 src/cls/Makefile-client.am                         |    6 +-
 src/cls/Makefile-server.am                         |    4 +-
 src/cls/cephfs/cls_cephfs.cc                       |   69 +
 src/cls/cephfs/cls_cephfs.h                        |   20 +
 src/cls/cephfs/cls_cephfs_client.cc                |   15 +
 src/cls/cephfs/cls_cephfs_client.h                 |    4 +
 src/cls/journal/cls_journal_types.h                |    2 +-
 src/cls/rbd/cls_rbd.cc                             |  362 ++-
 src/cls/rbd/cls_rbd.h                              |    2 +-
 src/cls/rbd/cls_rbd_client.cc                      |  708 ++++--
 src/cls/rbd/cls_rbd_client.h                       |  101 +-
 src/cls/rbd/cls_rbd_types.cc                       |   52 +
 src/cls/rbd/cls_rbd_types.h                        |   50 +
 src/common/BackTrace.h                             |    9 +
 src/common/ConfUtils.h                             |    2 +-
 src/common/Finisher.cc                             |    7 +-
 src/common/Finisher.h                              |    3 +
 src/common/Formatter.cc                            |   49 +-
 src/common/Formatter.h                             |   12 +-
 src/common/Makefile.am                             |   17 +-
 src/common/MemoryModel.cc                          |    1 +
 src/common/PluginRegistry.cc                       |  222 ++
 src/common/PluginRegistry.h                        |   70 +
 src/common/PrebufferedStreambuf.cc                 |   43 +-
 src/common/PrebufferedStreambuf.h                  |    8 +-
 src/common/Readahead.cc                            |   28 +-
 src/common/Readahead.h                             |    6 +-
 src/common/SubProcess.h                            |   95 +-
 src/common/WorkQueue.h                             |    7 +
 src/common/addr_parsing.c                          |    2 +-
 src/common/admin_socket.h                          |    2 +-
 src/common/aix_errno.cc                            |  225 ++
 src/common/buffer.cc                               |   39 +-
 src/common/ceph_context.cc                         |    6 +
 src/common/ceph_context.h                          |    9 +-
 src/common/ceph_crypto_cms.h                       |    2 +-
 src/common/config_opts.h                           |   19 +-
 src/common/dout.h                                  |    3 +-
 src/common/entity_name.h                           |    2 +-
 src/common/event_socket.h                          |   74 +
 src/common/hobject.h                               |    2 +
 src/common/io_priority.cc                          |    2 +
 src/common/lockdep.cc                              |   33 +-
 src/common/perf_counters.h                         |    1 -
 src/crush/CrushCompiler.cc                         |    4 +
 src/crush/CrushTester.cc                           |    2 +-
 src/erasure-code/ErasureCode.cc                    |    1 +
 src/erasure-code/ErasureCodeInterface.h            |    2 +-
 src/global/global_init.cc                          |    4 +
 src/global/signal_handler.cc                       |    7 +-
 src/include/Makefile.am                            |    6 +-
 src/include/assert.h                               |    2 +-
 src/include/buffer.h                               |   72 +-
 src/include/buffer_fwd.h                           |   17 +
 src/include/byteorder.h                            |    4 +
 src/include/compat.h                               |    6 +-
 src/{os/fs/XFS.h => include/event_type.h}          |   23 +-
 src/include/rados/buffer.h                         |   72 +-
 src/include/rados/buffer_fwd.h                     |   17 +
 src/include/rados/librados.h                       |    4 +-
 src/include/rbd/librbd.h                           |   44 +
 src/include/rbd/librbd.hpp                         |   23 +
 src/include/rbd_types.h                            |    7 +
 src/include/stringify.h                            |    5 +
 src/include/types.h                                |    4 +-
 src/include/utime.h                                |   12 +-
 src/init-ceph.in                                   |   17 +-
 src/init-radosgw                                   |    2 +-
 src/java/Makefile.in                               |    2 +
 src/journal/FutureImpl.cc                          |   15 +-
 src/journal/FutureImpl.h                           |    2 +-
 src/journal/JournalMetadata.cc                     |   46 +-
 src/journal/JournalPlayer.cc                       |  247 +-
 src/journal/JournalPlayer.h                        |   50 +-
 src/journal/JournalTrimmer.cc                      |   19 +-
 src/journal/JournalTrimmer.h                       |    2 +-
 src/journal/Journaler.cc                           |   47 +-
 src/journal/Journaler.h                            |   17 +-
 src/journal/ObjectPlayer.cc                        |   22 +-
 src/journal/ObjectRecorder.cc                      |   81 +-
 src/journal/ObjectRecorder.h                       |    6 +-
 src/kv/KineticStore.h                              |    2 +-
 src/kv/LevelDBStore.h                              |    2 +-
 src/kv/RocksDBStore.h                              |    2 +-
 src/librados/librados.cc                           |   17 +-
 src/librbd/AioCompletion.cc                        |   49 +-
 src/librbd/AioCompletion.h                         |   76 +-
 src/librbd/AioImageRequest.cc                      |  127 +-
 src/librbd/AioImageRequest.h                       |    7 +-
 src/librbd/AioImageRequestWQ.cc                    |  276 ++-
 src/librbd/AioImageRequestWQ.h                     |   80 +-
 src/librbd/AioObjectRequest.cc                     |   99 +-
 src/librbd/AioObjectRequest.h                      |    3 +-
 src/librbd/AsyncObjectThrottle.cc                  |    8 +-
 src/librbd/AsyncObjectThrottle.h                   |    1 -
 src/librbd/AsyncOperation.cc                       |    9 +-
 src/librbd/AsyncRequest.cc                         |   39 +-
 src/librbd/AsyncRequest.h                          |   21 +-
 src/librbd/AsyncResizeRequest.cc                   |  284 ---
 src/librbd/AsyncTrimRequest.cc                     |  361 ---
 src/librbd/CopyupRequest.cc                        |   64 +-
 src/librbd/CopyupRequest.h                         |    6 +-
 src/librbd/DiffIterate.cc                          |    4 +-
 src/librbd/ExclusiveLock.cc                        |  531 +++++
 src/librbd/ExclusiveLock.h                         |  162 ++
 src/librbd/ImageCtx.cc                             |  245 +-
 src/librbd/ImageCtx.h                              |   66 +-
 src/librbd/ImageState.cc                           |  389 ++++
 src/librbd/ImageState.h                            |  122 +
 src/librbd/ImageWatcher.cc                         |  840 +++----
 src/librbd/ImageWatcher.h                          |  233 +-
 src/librbd/Journal.cc                              |  558 +++--
 src/librbd/Journal.h                               |  117 +-
 src/librbd/JournalReplay.cc                        |  100 +-
 src/librbd/JournalReplay.h                         |   37 +-
 src/librbd/JournalTypes.cc                         |  161 ++
 src/librbd/JournalTypes.h                          |  191 +-
 src/librbd/LibrbdWriteback.cc                      |   38 +-
 src/librbd/LibrbdWriteback.h                       |    3 -
 src/librbd/Makefile.am                             |   74 +-
 src/librbd/ObjectMap.cc                            |  621 +----
 src/librbd/ObjectMap.h                             |  101 +-
 src/librbd/Utils.cc                                |   31 +
 src/librbd/Utils.h                                 |  139 ++
 src/librbd/WatchNotifyTypes.cc                     |  128 +-
 src/librbd/WatchNotifyTypes.h                      |  126 +-
 src/librbd/exclusive_lock/AcquireRequest.cc        |  456 ++++
 src/librbd/exclusive_lock/AcquireRequest.h         |  123 +
 src/librbd/exclusive_lock/ReleaseRequest.cc        |  218 ++
 src/librbd/exclusive_lock/ReleaseRequest.h         |   89 +
 src/librbd/image/CloseRequest.cc                   |  243 ++
 src/librbd/image/CloseRequest.h                    |  110 +
 src/librbd/image/OpenRequest.cc                    |  375 +++
 src/librbd/image/OpenRequest.h                     |  106 +
 src/librbd/image/RefreshParentRequest.cc           |  235 ++
 src/librbd/image/RefreshParentRequest.h            |   99 +
 src/librbd/image/RefreshRequest.cc                 |  763 +++++++
 src/librbd/image/RefreshRequest.h                  |  189 ++
 src/librbd/image/SetSnapRequest.cc                 |  342 +++
 src/librbd/image/SetSnapRequest.h                  |  121 +
 src/librbd/internal.cc                             | 2405 +++++++-------------
 src/librbd/internal.h                              |   71 +-
 src/librbd/librbd.cc                               |  228 +-
 src/librbd/object_map/InvalidateRequest.cc         |   88 +
 src/librbd/object_map/InvalidateRequest.h          |   49 +
 src/librbd/object_map/LockRequest.cc               |  154 ++
 src/librbd/object_map/LockRequest.h                |   72 +
 src/librbd/object_map/RefreshRequest.cc            |  224 ++
 src/librbd/object_map/RefreshRequest.h             |   76 +
 src/librbd/object_map/Request.cc                   |   73 +
 src/librbd/object_map/Request.h                    |   58 +
 src/librbd/object_map/ResizeRequest.cc             |   58 +
 src/librbd/object_map/ResizeRequest.h              |   48 +
 src/librbd/object_map/SnapshotCreateRequest.cc     |  148 ++
 src/librbd/object_map/SnapshotCreateRequest.h      |   79 +
 src/librbd/object_map/SnapshotRemoveRequest.cc     |  204 ++
 src/librbd/object_map/SnapshotRemoveRequest.h      |   91 +
 src/librbd/object_map/SnapshotRollbackRequest.cc   |  131 ++
 src/librbd/object_map/SnapshotRollbackRequest.h    |   77 +
 src/librbd/object_map/UnlockRequest.cc             |   66 +
 src/librbd/object_map/UnlockRequest.h              |   46 +
 src/librbd/object_map/UpdateRequest.cc             |   70 +
 src/librbd/object_map/UpdateRequest.h              |   49 +
 .../FlattenRequest.cc}                             |  110 +-
 .../FlattenRequest.h}                              |   31 +-
 .../{ => operation}/RebuildObjectMapRequest.cc     |  177 +-
 .../{ => operation}/RebuildObjectMapRequest.h      |   20 +-
 src/librbd/operation/RenameRequest.cc              |  193 ++
 src/librbd/operation/RenameRequest.h               |   90 +
 src/librbd/operation/Request.cc                    |   67 +
 src/librbd/operation/Request.h                     |   52 +
 src/librbd/operation/ResizeRequest.cc              |  310 +++
 .../ResizeRequest.h}                               |   40 +-
 src/librbd/operation/SnapshotCreateRequest.cc      |  323 +++
 src/librbd/operation/SnapshotCreateRequest.h       |  127 ++
 src/librbd/operation/SnapshotProtectRequest.cc     |  115 +
 src/librbd/operation/SnapshotProtectRequest.h      |   67 +
 src/librbd/operation/SnapshotRemoveRequest.cc      |  236 ++
 src/librbd/operation/SnapshotRemoveRequest.h       |   96 +
 src/librbd/operation/SnapshotRenameRequest.cc      |   91 +
 src/librbd/operation/SnapshotRenameRequest.h       |   66 +
 src/librbd/operation/SnapshotRollbackRequest.cc    |  273 +++
 src/librbd/operation/SnapshotRollbackRequest.h     |  101 +
 src/librbd/operation/SnapshotUnprotectRequest.cc   |  350 +++
 src/librbd/operation/SnapshotUnprotectRequest.h    |   93 +
 src/librbd/operation/TrimRequest.cc                |  385 ++++
 .../TrimRequest.h}                                 |   22 +-
 src/librbd/parent_types.h                          |    8 +-
 src/log/Entry.h                                    |   51 +-
 src/log/Log.cc                                     |   55 +-
 src/log/Log.h                                      |    1 +
 src/log/test.cc                                    |    5 +-
 src/mds/CDentry.h                                  |    2 +-
 src/mds/CDir.h                                     |    2 +-
 src/mds/CInode.cc                                  |    6 +-
 src/mds/CInode.h                                   |    2 +-
 src/mds/Capability.h                               |    2 +-
 src/mds/InoTable.h                                 |   21 +
 src/mds/Locker.cc                                  |    5 +
 src/mds/LogEvent.h                                 |    2 +-
 src/mds/MDCache.cc                                 |   13 +-
 src/mds/MDCache.h                                  |    6 +-
 src/mds/MDSAuthCaps.cc                             |   21 +-
 src/mds/MDSAuthCaps.h                              |   16 +-
 src/mds/MDSDaemon.cc                               |   15 +
 src/mds/MDSMap.cc                                  |   52 +
 src/mds/MDSMap.h                                   |   37 +-
 src/mds/MDSTable.h                                 |    2 +-
 src/mds/Server.cc                                  |   48 +-
 src/messages/MOSDOp.h                              |   16 +-
 src/messages/MOSDOpReply.h                         |   27 +-
 src/messages/MOSDRepOp.h                           |   33 +-
 src/messages/MOSDRepOpReply.h                      |   34 +-
 src/messages/MOSDSubOp.h                           |    2 +
 src/messages/MOSDSubOpReply.h                      |    3 +
 src/mon/MDSMonitor.cc                              |    9 +-
 src/mon/MonCommands.h                              |    4 +-
 src/mon/OSDMonitor.cc                              |   97 +-
 src/mount/mtab.c                                   |    2 +
 src/msg/Message.h                                  |    8 +-
 src/msg/Messenger.h                                |    1 +
 src/ocf/Makefile.in                                |    2 +
 src/os/DBObjectMap.h                               |    2 +-
 src/os/FileJournal.cc                              |   17 +-
 src/os/FileStore.cc                                |   20 +-
 src/os/FileStore.h                                 |   12 +-
 src/os/HashIndex.h                                 |    2 +-
 src/os/Journal.h                                   |    2 +-
 src/os/JournalingObjectStore.h                     |    2 +-
 src/os/KeyValueStore.cc                            |   17 +-
 src/os/KeyValueStore.h                             |    4 -
 src/os/MemStore.cc                                 |   10 +-
 src/os/MemStore.h                                  |    2 -
 src/os/ObjectStore.cc                              |   14 +
 src/os/ObjectStore.h                               |   15 +-
 src/os/WBThrottle.cc                               |    3 +-
 src/os/WBThrottle.h                                |    9 +-
 src/os/fs/XFS.h                                    |    2 +-
 src/osd/ECUtil.cc                                  |   16 +
 src/osd/ECUtil.h                                   |   17 +-
 src/osd/OSD.cc                                     |   66 +-
 src/osd/OSD.h                                      |   26 +-
 src/osd/OpRequest.cc                               |    1 +
 src/osd/PG.cc                                      |   82 +-
 src/osd/PG.h                                       |    6 +-
 src/osd/PGBackend.cc                               |    2 +-
 src/osd/PGLog.cc                                   |   19 +-
 src/osd/PGLog.h                                    |    7 +-
 src/osd/ReplicatedBackend.cc                       |    9 +-
 src/osd/ReplicatedPG.cc                            |   20 +-
 src/osd/ReplicatedPG.h                             |    5 +
 src/osd/osd_types.cc                               |  221 +-
 src/osd/osd_types.h                                |  253 +-
 src/osdc/Objecter.h                                |   11 -
 src/pybind/Makefile.am                             |   51 +
 src/pybind/cephfs.py                               |   13 +
 src/pybind/rados.py                                |   56 +-
 src/pybind/rbd.py                                  | 1262 ----------
 src/pybind/rbd.pyx                                 | 1426 ++++++++++++
 src/pybind/setup.py                                |   51 +
 src/rbd_replay/ActionTypes.h                       |    2 +-
 src/rbd_replay/ios.hpp                             |    2 +-
 src/rgw/Makefile.am                                |    4 +-
 src/rgw/rgw_acl.cc                                 |   18 +-
 src/rgw/rgw_acl.h                                  |   50 +-
 src/rgw/rgw_acl_s3.cc                              |   21 +-
 src/rgw/rgw_acl_swift.cc                           |   35 +-
 src/rgw/rgw_acl_swift.h                            |    6 +-
 src/rgw/rgw_admin.cc                               |   79 +-
 src/rgw/rgw_basic_types.cc                         |   14 +
 src/rgw/rgw_basic_types.h                          |  111 +
 src/rgw/rgw_bucket.cc                              |  157 +-
 src/rgw/rgw_bucket.h                               |   39 +-
 src/rgw/rgw_client_io.h                            |   63 +
 src/rgw/rgw_common.cc                              |   56 +-
 src/rgw/rgw_common.h                               |  102 +-
 src/rgw/rgw_dencoder.cc                            |   18 +-
 src/rgw/rgw_formats.cc                             |   49 +-
 src/rgw/rgw_formats.h                              |    3 +-
 src/rgw/rgw_http_errors.h                          |    1 +
 src/rgw/rgw_json_enc.cc                            |   35 +-
 src/rgw/rgw_log.cc                                 |   21 +-
 src/rgw/rgw_log.h                                  |   22 +-
 src/rgw/rgw_main.cc                                |    8 +-
 src/rgw/rgw_metadata.h                             |   15 +
 src/rgw/rgw_object_expirer_core.cc                 |   19 +-
 src/rgw/rgw_object_expirer_core.h                  |    3 +-
 src/rgw/rgw_op.cc                                  |  722 +++++-
 src/rgw/rgw_op.h                                   |  208 +-
 src/rgw/rgw_quota.cc                               |  103 +-
 src/rgw/rgw_quota.h                                |    4 +-
 src/rgw/rgw_rados.cc                               |  161 +-
 src/rgw/rgw_rados.h                                |   68 +-
 src/rgw/rgw_resolve.cc                             |   31 +-
 src/rgw/rgw_rest.cc                                |   98 +-
 src/rgw/rgw_rest.h                                 |   43 +-
 src/rgw/rgw_rest_bucket.cc                         |   19 +-
 src/rgw/rgw_rest_client.cc                         |    4 +-
 src/rgw/rgw_rest_conn.cc                           |   15 +-
 src/rgw/rgw_rest_conn.h                            |    6 +-
 src/rgw/rgw_rest_log.cc                            |   15 +-
 src/rgw/rgw_rest_metadata.cc                       |    4 +-
 src/rgw/rgw_rest_s3.cc                             |  129 +-
 src/rgw/rgw_rest_swift.cc                          |  250 +-
 src/rgw/rgw_rest_swift.h                           |   12 +
 src/rgw/rgw_rest_usage.cc                          |   12 +-
 src/rgw/rgw_rest_user.cc                           |   82 +-
 src/rgw/rgw_swift.cc                               |   12 +-
 src/rgw/rgw_swift.h                                |    2 +-
 src/rgw/rgw_usage.cc                               |    4 +-
 src/rgw/rgw_usage.h                                |    4 +-
 src/rgw/rgw_user.cc                                |   99 +-
 src/rgw/rgw_user.h                                 |   40 +-
 src/test/Makefile-client.am                        |   25 +-
 src/test/Makefile.am                               |    2 +
 src/test/bench/bencher.cc                          |    3 +-
 src/test/bench/bencher.h                           |    2 +-
 src/test/bufferlist.cc                             |   64 +-
 src/test/centos-6/ceph.spec.in                     |   37 +-
 src/test/centos-7/ceph.spec.in                     |   37 +-
 src/test/cli/rbd/help.t                            |  432 +++-
 src/test/cls_rbd/test_cls_rbd.cc                   |  146 +-
 src/test/common/ObjectContents.h                   |    2 +-
 src/test/common/test_tableformatter.cc             |    2 +
 src/test/encoding/readable.sh                      |  179 +-
 src/test/encoding/types.h                          |   11 +-
 src/test/erasure-code/ceph_erasure_code.cc         |    1 -
 .../erasure-code/ceph_erasure_code_benchmark.cc    |    1 -
 .../ceph_erasure_code_non_regression.cc            |    1 -
 src/test/fedora-21/ceph.spec.in                    |   37 +-
 src/test/journal/test_JournalPlayer.cc             |   45 +-
 src/test/journal/test_JournalTrimmer.cc            |    5 +-
 src/test/libcephfs/test.cc                         |   53 +-
 src/test/librados/c_read_operations.cc             |    5 +-
 src/test/librados/cls.cc                           |    1 -
 src/test/librados/cmd.cc                           |    1 -
 src/test/librados/io.cc                            |    8 +-
 src/test/librados/misc.cc                          |    1 -
 src/test/librados/test.cc                          |  136 +-
 src/test/librados/tier.cc                          |    1 -
 src/test/librados_test_stub/LibradosTestStub.cc    |   38 +
 src/test/librados_test_stub/MockTestMemIoCtxImpl.h |   17 +
 .../librados_test_stub/MockTestMemRadosClient.h    |    8 +
 src/test/librados_test_stub/TestRadosClient.h      |    2 +-
 src/test/libradosstriper/io.cc                     |    4 +-
 .../exclusive_lock/test_mock_AcquireRequest.cc     |  571 +++++
 .../exclusive_lock/test_mock_ReleaseRequest.cc     |  197 ++
 src/test/librbd/fsx.cc                             |  138 +-
 src/test/librbd/mock/MockAioImageRequestWQ.h       |   20 +
 src/test/librbd/mock/MockExclusiveLock.h           |   25 +
 src/test/librbd/mock/MockImageCtx.h                |   61 +-
 src/test/librbd/mock/MockImageWatcher.h            |   10 +-
 src/test/librbd/mock/MockJournal.h                 |   28 +
 src/test/librbd/mock/MockObjectMap.h               |    5 +
 src/test/librbd/mock/MockReadahead.h               |   21 +
 .../librbd/object_map/mock/MockInvalidateRequest.h |   42 +
 .../object_map/test_mock_InvalidateRequest.cc      |  153 ++
 .../librbd/object_map/test_mock_LockRequest.cc     |  215 ++
 .../librbd/object_map/test_mock_RefreshRequest.cc  |  251 ++
 .../librbd/object_map/test_mock_ResizeRequest.cc   |  144 ++
 .../object_map/test_mock_SnapshotCreateRequest.cc  |  221 ++
 .../object_map/test_mock_SnapshotRemoveRequest.cc  |  276 +++
 .../test_mock_SnapshotRollbackRequest.cc           |  143 ++
 .../librbd/object_map/test_mock_UnlockRequest.cc   |   67 +
 .../librbd/object_map/test_mock_UpdateRequest.cc   |  199 ++
 .../operation/test_mock_SnapshotCreateRequest.cc   |  270 +++
 .../operation/test_mock_SnapshotProtectRequest.cc  |  191 ++
 .../operation/test_mock_SnapshotRemoveRequest.cc   |  359 +++
 .../test_mock_SnapshotUnprotectRequest.cc          |  276 +++
 src/test/librbd/test_ImageWatcher.cc               |  623 +----
 src/test/librbd/test_JournalEntries.cc             |    9 +-
 src/test/librbd/test_JournalReplay.cc              |   85 +-
 src/test/librbd/test_ObjectMap.cc                  |   44 +-
 src/test/librbd/test_fixture.cc                    |   23 +-
 src/test/librbd/test_fixture.h                     |    2 +
 src/test/librbd/test_internal.cc                   |  118 +-
 src/test/librbd/test_librbd.cc                     |  425 +++-
 src/test/librbd/test_mock_ExclusiveLock.cc         |  556 +++++
 src/test/librbd/test_mock_fixture.cc               |    2 +
 src/test/librbd/test_mock_fixture.h                |   18 +
 src/test/mon/misc.sh                               |   85 +-
 src/test/multi_stress_watch.cc                     |    1 -
 src/test/objectstore_bench.cc                      |   35 +
 src/test/opensuse-13.2/ceph.spec.in                |   37 +-
 src/test/osd/TestPGLog.cc                          |   34 +
 src/test/osd/osd-scrub-repair.sh                   |   11 +-
 src/test/osd/osd-scrub-snaps.sh                    |   14 +-
 src/test/osd/types.cc                              |   59 +
 src/test/pybind/test_ceph_argparse.py              |   10 +-
 src/test/rgw/test_rgw_manifest.cc                  |    6 +-
 src/test/rgw/test_rgw_obj.cc                       |    2 +-
 src/test/test_stress_watch.cc                      |    1 -
 src/test/test_subprocess.cc                        |   28 +-
 src/tools/Makefile-client.am                       |   12 +-
 src/tools/ceph_kvstore_tool.cc                     |    7 +-
 src/tools/ceph_monstore_tool.cc                    |   53 +-
 src/tools/ceph_objectstore_tool.cc                 |    4 +-
 src/tools/cephfs/DataScan.cc                       |  512 ++++-
 src/tools/cephfs/DataScan.h                        |   97 +-
 src/tools/cephfs/TableTool.cc                      |  271 +--
 src/tools/cephfs/TableTool.h                       |   11 +-
 src/tools/rados/RadosImport.h                      |    2 +-
 src/tools/rados/rados.cc                           |    4 +-
 src/tools/rbd/ArgumentTypes.cc                     |  102 +-
 src/tools/rbd/ArgumentTypes.h                      |   39 +-
 src/tools/rbd/Shell.cc                             |    2 +-
 src/tools/rbd/Utils.cc                             |  237 +-
 src/tools/rbd/Utils.h                              |   16 +-
 src/tools/rbd/action/Clone.cc                      |   21 +-
 src/tools/rbd/action/Copy.cc                       |   17 +-
 src/tools/rbd/action/Create.cc                     |   29 +-
 src/tools/rbd/action/DiskUsage.cc                  |   14 +-
 src/tools/rbd/action/Feature.cc                    |   27 +-
 src/tools/rbd/action/Import.cc                     |   47 +-
 src/tools/rbd/action/Info.cc                       |    8 +
 src/tools/rbd/action/Journal.cc                    |  969 ++++++++
 src/tools/rbd/action/List.cc                       |   32 +-
 src/tools/rbd/action/MergeDiff.cc                  |    7 +-
 src/tools/rbd/action/MirrorPool.cc                 |  421 ++++
 src/tools/rbd/action/Nbd.cc                        |  186 ++
 src/tools/rbd_nbd/rbd-nbd.cc                       |  739 ++++++
 src/tools/scratchtool.c                            |    2 +-
 src/tracing/librbd.tp                              |   39 +
 src/vstart.sh                                      |   20 +-
 systemd/Makefile.am                                |    4 +
 systemd/Makefile.in                                |    6 +
 systemd/ceph-disk at .service                         |    2 +-
 systemd/ceph-mds.target                            |    5 +
 systemd/ceph-mds at .service                          |    4 +-
 systemd/ceph-mon.target                            |    5 +
 systemd/ceph-mon at .service                          |    4 +-
 systemd/ceph-osd.target                            |    5 +
 systemd/ceph-osd at .service                          |    4 +-
 systemd/ceph-radosgw.target                        |    5 +
 systemd/ceph-radosgw at .service                      |    4 +-
 501 files changed, 33849 insertions(+), 10032 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