[Pkg-ceph-commits] [ceph] 01/05: Merge branch 'jewel' into ubuntu-xenial

James Downing Page jamespage at moszumanska.debian.org
Wed Feb 17 11:03:38 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 52847b7afeaf8e21bbd526c1ee94ae20ffeae121
Merge: 4eb0204 40ace3c
Author: James Page <james.page at ubuntu.com>
Date:   Wed Feb 17 10:42:24 2016 +0000

    Merge branch 'jewel' into ubuntu-xenial

 AUTHORS                                            |    88 +-
 COPYING                                            |     5 +
 ChangeLog                                          |  1258 +-
 INSTALL                                            |    25 +-
 Makefile.am                                        |     5 +
 Makefile.in                                        |   416 +-
 autogen.sh                                         |     1 -
 ceph.spec                                          |    57 +-
 ceph.spec.in                                       |    55 +-
 configure                                          |   362 +-
 configure.ac                                       |    90 +-
 debian/ceph-common.install                         |     3 +-
 debian/ceph-test.install                           |     1 -
 debian/changelog                                   |    13 +
 debian/control                                     |    33 +-
 debian/copyright                                   |     1 -
 debian/gbp.conf                                    |     2 +-
 debian/librados-dev.install                        |     1 +
 debian/patches/arch.patch                          |     2 +-
 debian/patches/ceph-detect-init-ubuntu.patch       |    28 -
 debian/patches/fix-argparse-defaults.patch         |     2 +-
 debian/patches/flock-location-debian.patch         |    13 -
 debian/patches/modules.patch                       |   136 -
 debian/patches/pybind-flags.patch                  |    34 +
 debian/patches/series                              |     1 -
 debian/patches/sleep-recover.patch                 |     2 +-
 debian/patches/tests-disable-ceph-disk.patch       |     2 +-
 debian/patches/tests-disable.patch                 |     4 +-
 debian/patches/vivid-does-systemd.patch            |    18 -
 debian/python-rbd.install                          |     3 +-
 debian/rbd-nbd.install                             |     2 +
 debian/rules                                       |     2 +
 doc/Makefile.am                                    |     1 +
 doc/Makefile.in                                    |     4 +
 doc/man/8/ceph-disk.rst                            |    81 +-
 doc/man/8/ceph.rst                                 |    13 +-
 doc/man/8/rbd-nbd.rst                              |    55 +
 doc/man/8/rbd.rst                                  |    59 +-
 install-deps.sh                                    |     5 +-
 man/Makefile-client.am                             |     1 +
 man/Makefile.in                                    |     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                                    |   143 +-
 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                                         |    23 +-
 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-nbd.8                                      |    77 +
 man/rbd-replay-many.8                              |     2 +-
 man/rbd-replay-prep.8                              |     2 +-
 man/rbd-replay.8                                   |     2 +-
 man/rbd.8                                          |    65 +-
 selinux/Makefile.in                                |     3 +
 src/.git_version                                   |     4 +-
 src/Makefile-client.am                             |    12 +-
 src/Makefile-env.am                                |    68 +-
 src/Makefile-rocksdb.am                            |  1217 +-
 src/Makefile-server.am                             |    10 +-
 src/Makefile.am                                    |    24 +-
 src/Makefile.in                                    |  6866 ++++---
 src/acconfig.h.in                                  |    21 +
 src/auth/Crypto.cc                                 |     3 +-
 src/auth/cephx/CephxServiceHandler.cc              |    13 +-
 src/auth/cephx/CephxSessionHandler.cc              |     5 +-
 src/bash_completion/rbd                            |    97 +-
 src/ceph-detect-init/Makefile.am                   |    10 +-
 .../ceph_detect_init/debian/__init__.py            |     5 +-
 src/ceph-detect-init/tests/test_all.py             |     3 +
 src/ceph-disk                                      |   482 +-
 src/ceph.in                                        |    31 +-
 src/ceph_fuse.cc                                   |    37 +-
 src/ceph_mds.cc                                    |     8 +-
 src/ceph_mon.cc                                    |     6 +-
 src/ceph_osd.cc                                    |    58 +-
 src/ceph_syn.cc                                    |     4 -
 src/client/Client.cc                               |   315 +-
 src/client/Client.h                                |    34 +-
 src/client/Inode.h                                 |     3 +
 src/client/ObjecterWriteback.h                     |     7 +-
 src/client/SyntheticClient.cc                      |    20 +-
 src/client/Trace.h                                 |     2 +-
 src/client/fuse_ll.cc                              |     1 +
 src/cls/Makefile-client.am                         |    16 +-
 src/cls/Makefile-server.am                         |    14 +-
 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.cc                     |   619 +
 src/cls/journal/cls_journal_client.cc              |   274 +
 src/cls/journal/cls_journal_client.h               |    51 +
 src/cls/journal/cls_journal_types.cc               |   155 +
 src/cls/journal/cls_journal_types.h                |   108 +
 src/cls/rbd/cls_rbd.cc                             |   555 +-
 src/cls/rbd/cls_rbd.h                              |     2 +-
 src/cls/rbd/cls_rbd_client.cc                      |   701 +-
 src/cls/rbd/cls_rbd_client.h                       |    98 +-
 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                             |    42 +-
 src/common/MemoryModel.cc                          |     4 +-
 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                            |   106 +-
 src/common/Thread.h                                |     4 +-
 src/common/Throttle.cc                             |     4 +-
 src/common/TrackedOp.cc                            |    45 +-
 src/common/TrackedOp.h                             |    21 +-
 src/common/WorkQueue.h                             |   137 +-
 src/common/addr_parsing.c                          |     2 +-
 src/common/admin_socket.h                          |     2 +-
 src/common/aix_errno.cc                            |   225 +
 src/common/buffer.cc                               |    41 +-
 src/common/ceph_context.cc                         |    14 +-
 src/common/ceph_context.h                          |    15 +-
 src/common/ceph_crypto_cms.h                       |     2 +-
 src/common/common_init.cc                          |     6 +-
 src/common/common_init.h                           |     2 +-
 src/common/config.cc                               |    16 +
 src/common/config.h                                |     2 +
 src/common/config_opts.h                           |    58 +-
 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/obj_bencher.cc                          |    24 +-
 src/common/obj_bencher.h                           |     6 +-
 src/common/perf_counters.h                         |     1 -
 src/common/run_cmd.cc                              |     3 +
 src/common/sctp_crc32.c                            |     3 +-
 src/common/solaris_errno.cc                        |   227 +
 src/crush/CrushCompiler.cc                         |     4 +
 src/crush/CrushTester.cc                           |     6 +-
 src/crush/mapper.c                                 |    15 +-
 src/erasure-code/ErasureCode.cc                    |     1 +
 src/erasure-code/ErasureCodeInterface.h            |     2 +-
 src/erasure-code/isa/Makefile.am                   |     2 +-
 src/erasure-code/jerasure/Makefile.am              |    10 +-
 src/erasure-code/lrc/Makefile.am                   |     2 +-
 src/erasure-code/shec/Makefile.am                  |    10 +-
 src/{rbdmap => etc-rbdmap}                         |     0
 src/global/Makefile.am                             |     3 +-
 src/global/global_init.cc                          |    16 +-
 src/global/global_init.h                           |     6 +-
 src/global/signal_handler.cc                       |    20 +
 src/include/Makefile.am                            |     6 +-
 src/include/assert.h                               |     8 +
 src/include/buffer.h                               |    74 +-
 src/include/buffer_fwd.h                           |    17 +
 src/include/byteorder.h                            |    15 +
 src/include/ceph_features.h                        |     6 +
 src/include/ceph_fs.h                              |     3 +-
 src/include/cephfs/libcephfs.h                     |    18 +-
 src/include/compat.h                               |    13 +-
 src/include/encoding.h                             |     2 +
 src/include/event_type.h                           |    24 +
 src/include/rados.h                                |     4 +
 src/include/rados/buffer.h                         |    74 +-
 src/include/rados/buffer_fwd.h                     |    17 +
 src/include/rados/librados.h                       |    62 +-
 src/include/rados/librados.hpp                     |    25 +
 src/include/rbd/features.h                         |    13 +-
 src/include/rbd/librbd.h                           |    83 +
 src/include/rbd/librbd.hpp                         |    53 +
 src/include/rbd_types.h                            |     7 +
 src/include/sock_compat.h                          |    12 -
 src/include/stringify.h                            |     5 +
 src/include/types.h                                |    35 +
 src/include/utime.h                                |    12 +-
 src/init-ceph.in                                   |    59 +-
 src/init-radosgw                                   |     8 +-
 src/init-rbdmap                                    |   105 +-
 src/java/Makefile.in                               |     3 +
 src/journal/AsyncOpTracker.cc                      |    39 +
 src/journal/AsyncOpTracker.h                       |    32 +
 src/journal/Entry.cc                               |   156 +
 src/journal/Entry.h                                |    62 +
 src/journal/Future.cc                              |    40 +
 src/journal/Future.h                               |    58 +
 src/journal/FutureImpl.cc                          |   152 +
 src/journal/FutureImpl.h                           |   128 +
 src/journal/JournalMetadata.cc                     |   505 +
 src/journal/JournalMetadata.h                      |   324 +
 src/journal/JournalPlayer.cc                       |   440 +
 src/journal/JournalPlayer.h                        |   120 +
 src/journal/JournalRecorder.cc                     |   182 +
 src/journal/JournalRecorder.h                      |   117 +
 src/journal/JournalTrimmer.cc                      |   211 +
 src/journal/JournalTrimmer.h                       |    83 +
 src/journal/Journaler.cc                           |   267 +
 src/journal/Journaler.h                            |   103 +
 src/journal/Makefile.am                            |    37 +
 src/journal/ObjectPlayer.cc                        |   240 +
 src/journal/ObjectPlayer.h                         |   133 +
 src/journal/ObjectRecorder.cc                      |   331 +
 src/journal/ObjectRecorder.h                       |   153 +
 src/journal/ReplayEntry.h                          |    34 +
 src/journal/ReplayHandler.h                        |    21 +
 src/journal/Utils.cc                               |    25 +
 src/journal/Utils.h                                |    23 +
 src/krbd.cc                                        |    13 +-
 src/{os => kv}/KeyValueDB.cc                       |     0
 src/kv/KeyValueDB.h                                |   277 +
 src/kv/KineticStore.cc                             |   348 +
 src/kv/KineticStore.h                              |   161 +
 src/kv/LevelDBStore.cc                             |   349 +
 src/kv/LevelDBStore.h                              |   415 +
 src/kv/Makefile.am                                 |    40 +
 src/kv/RocksDBStore.cc                             |   587 +
 src/kv/RocksDBStore.h                              |   285 +
 src/libcephfs.cc                                   |     4 +-
 src/librados/IoCtxImpl.cc                          |   242 +-
 src/librados/IoCtxImpl.h                           |     6 +
 src/librados/RadosClient.cc                        |    54 +-
 src/librados/RadosClient.h                         |     2 +
 src/librados/RadosXattrIter.cc                     |     2 +
 src/librados/librados.cc                           |   135 +-
 src/librbd/AioCompletion.cc                        |    80 +-
 src/librbd/AioCompletion.h                         |   145 +-
 src/librbd/AioImageRequest.cc                      |   466 +
 src/librbd/AioImageRequest.h                       |   216 +
 src/librbd/AioImageRequestWQ.cc                    |   421 +
 src/librbd/AioImageRequestWQ.h                     |   112 +
 src/librbd/AioObjectRequest.cc                     |   578 +
 src/librbd/AioObjectRequest.h                      |   350 +
 src/librbd/AioRequest.cc                           |   526 -
 src/librbd/AioRequest.h                            |   347 -
 src/librbd/AsyncFlattenRequest.cc                  |   177 -
 src/librbd/AsyncFlattenRequest.h                   |    81 -
 src/librbd/AsyncObjectThrottle.cc                  |     8 +-
 src/librbd/AsyncObjectThrottle.h                   |     1 -
 src/librbd/AsyncOperation.cc                       |    41 +-
 src/librbd/AsyncRequest.cc                         |    39 +-
 src/librbd/AsyncRequest.h                          |    21 +-
 src/librbd/AsyncResizeRequest.cc                   |   284 -
 src/librbd/AsyncResizeRequest.h                    |   102 -
 src/librbd/AsyncTrimRequest.cc                     |   361 -
 src/librbd/AsyncTrimRequest.h                      |    90 -
 src/librbd/CopyupRequest.cc                        |    80 +-
 src/librbd/CopyupRequest.h                         |    10 +-
 src/librbd/DiffIterate.cc                          |     4 +-
 src/librbd/ExclusiveLock.cc                        |   531 +
 src/librbd/ExclusiveLock.h                         |   162 +
 src/librbd/ImageCtx.cc                             |   408 +-
 src/librbd/ImageCtx.h                              |    80 +-
 src/librbd/ImageState.cc                           |   389 +
 src/librbd/ImageState.h                            |   122 +
 src/librbd/ImageWatcher.cc                         |   870 +-
 src/librbd/ImageWatcher.h                          |   492 +-
 src/librbd/Journal.cc                              |   765 +
 src/librbd/Journal.h                               |   256 +
 src/librbd/JournalReplay.cc                        |   192 +
 src/librbd/JournalReplay.h                         |    77 +
 src/librbd/JournalTypes.cc                         |   353 +
 src/librbd/JournalTypes.h                          |   284 +
 src/librbd/LibrbdAdminSocketHook.cc                |    97 +
 src/librbd/LibrbdAdminSocketHook.h                 |    31 +
 src/librbd/LibrbdWriteback.cc                      |   141 +-
 src/librbd/LibrbdWriteback.h                       |    14 +-
 src/librbd/Makefile.am                             |    93 +-
 src/librbd/ObjectMap.cc                            |   625 +-
 src/librbd/ObjectMap.h                             |   102 +-
 src/librbd/RebuildObjectMapRequest.cc              |   361 -
 src/librbd/RebuildObjectMapRequest.h               |    78 -
 src/librbd/Utils.cc                                |    31 +
 src/librbd/Utils.h                                 |   139 +
 src/librbd/WatchNotifyTypes.cc                     |   151 +-
 src/librbd/WatchNotifyTypes.h                      |   173 +-
 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                             |  2941 ++-
 src/librbd/internal.h                              |   131 +-
 src/librbd/librbd.cc                               |   646 +-
 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 +
 src/librbd/operation/FlattenRequest.cc             |   191 +
 src/librbd/operation/FlattenRequest.h              |    90 +
 src/librbd/operation/RebuildObjectMapRequest.cc    |   384 +
 src/librbd/operation/RebuildObjectMapRequest.h     |    84 +
 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 +
 src/librbd/operation/ResizeRequest.h               |   112 +
 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 +
 src/librbd/operation/TrimRequest.h                 |    96 +
 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.cc                                 |    53 +
 src/mds/CDentry.h                                  |    53 +-
 src/mds/CDir.cc                                    |   261 +-
 src/mds/CDir.h                                     |   105 +-
 src/mds/CInode.cc                                  |   269 +-
 src/mds/CInode.h                                   |    93 +-
 src/mds/Capability.h                               |     2 +-
 src/mds/InoTable.h                                 |    21 +
 src/mds/Locker.cc                                  |    11 +
 src/mds/LogEvent.h                                 |     2 +-
 src/mds/MDCache.cc                                 |   135 +-
 src/mds/MDCache.h                                  |    27 +-
 src/mds/MDSAuthCaps.cc                             |   173 +-
 src/mds/MDSAuthCaps.h                              |   114 +-
 src/mds/MDSContinuation.h                          |    12 +-
 src/mds/MDSDaemon.cc                               |    53 +-
 src/mds/MDSMap.cc                                  |    52 +
 src/mds/MDSMap.h                                   |    37 +-
 src/mds/MDSRank.cc                                 |   185 +-
 src/mds/MDSRank.h                                  |    44 +-
 src/mds/MDSTable.h                                 |     2 +-
 src/mds/Makefile-server.am                         |     2 +
 src/mds/Makefile.am                                |     4 +-
 src/mds/ScrubHeader.h                              |    23 +
 src/mds/ScrubStack.cc                              |   447 +
 src/mds/ScrubStack.h                               |   201 +
 src/mds/Server.cc                                  |   153 +-
 src/mds/Server.h                                   |     2 +
 src/mds/SessionMap.cc                              |   350 +-
 src/mds/SessionMap.h                               |    37 +-
 src/mds/mdstypes.cc                                |    40 +-
 src/mds/mdstypes.h                                 |    22 +-
 src/messages/MAuthReply.h                          |     2 +-
 src/messages/MClientCaps.h                         |    22 +-
 src/messages/MCommandReply.h                       |     2 +-
 src/messages/MLog.h                                |     3 +-
 src/messages/MMonCommandAck.h                      |     2 +-
 src/messages/MOSDOp.h                              |   280 +-
 src/messages/MOSDOpReply.h                         |    31 +-
 src/messages/MOSDPGCreate.h                        |     8 +-
 src/messages/MOSDRepOp.h                           |    33 +-
 src/messages/MOSDRepOpReply.h                      |    34 +-
 src/messages/MOSDSubOp.h                           |     2 +
 src/messages/MOSDSubOpReply.h                      |     3 +
 src/messages/MRoute.h                              |    41 +-
 src/messages/MWatchNotify.h                        |     2 +-
 src/mon/MDSMonitor.cc                              |     9 +-
 src/mon/Makefile.am                                |     6 +-
 src/mon/MonCap.cc                                  |     2 +
 src/mon/MonClient.cc                               |    37 +-
 src/mon/MonClient.h                                |    55 +-
 src/mon/MonCommands.h                              |     4 +-
 src/mon/Monitor.cc                                 |    74 +-
 src/mon/MonitorDBStore.h                           |     3 +-
 src/mon/OSDMonitor.cc                              |   203 +-
 src/mon/OSDMonitor.h                               |    21 +-
 src/mon/PGMap.cc                                   |    18 +-
 src/mon/PGMap.h                                    |     4 +-
 src/mon/PGMonitor.cc                               |   369 +-
 src/mon/PGMonitor.h                                |    22 +-
 src/mon/Session.h                                  |     2 +-
 src/mount/mtab.c                                   |     2 +
 src/msg/Connection.h                               |    18 +-
 src/msg/Message.h                                  |     8 +-
 src/msg/Messenger.h                                |     1 +
 src/msg/async/AsyncConnection.cc                   |   109 +-
 src/msg/async/AsyncConnection.h                    |    11 +
 src/msg/async/Event.cc                             |     2 +-
 src/msg/async/net_handler.cc                       |    16 +-
 src/msg/async/net_handler.h                        |     9 +
 src/msg/msg_types.h                                |    47 +-
 src/msg/simple/Pipe.cc                             |   107 +-
 src/msg/simple/Pipe.h                              |     9 +
 src/ocf/Makefile.in                                |     3 +
 src/os/DBObjectMap.cc                              |    15 +-
 src/os/DBObjectMap.h                               |     8 +-
 src/os/FileJournal.cc                              |   158 +-
 src/os/FileJournal.h                               |    22 +-
 src/os/FileStore.cc                                |   121 +-
 src/os/FileStore.h                                 |    26 +-
 src/os/GenericObjectMap.cc                         |     2 +-
 src/os/GenericObjectMap.h                          |     6 +-
 src/os/HashIndex.h                                 |     2 +-
 src/os/IndexManager.cc                             |     2 +-
 src/os/Journal.h                                   |     7 +-
 src/os/JournalingObjectStore.cc                    |    22 +-
 src/os/JournalingObjectStore.h                     |    11 +-
 src/os/KeyValueDB.h                                |   220 -
 src/os/KeyValueStore.cc                            |    21 +-
 src/os/KeyValueStore.h                             |     6 +-
 src/os/KineticStore.cc                             |   329 -
 src/os/KineticStore.h                              |   160 -
 src/os/LFNIndex.cc                                 |     1 -
 src/os/LevelDBStore.cc                             |   306 -
 src/os/LevelDBStore.h                              |   402 -
 src/os/Makefile.am                                 |    55 +-
 src/os/MemStore.cc                                 |    46 +-
 src/os/MemStore.h                                  |     9 +-
 src/os/ObjectMap.h                                 |    14 +-
 src/os/ObjectStore.cc                              |    49 +
 src/os/ObjectStore.h                               |    72 +-
 src/os/RocksDBStore.cc                             |   518 -
 src/os/RocksDBStore.h                              |   280 -
 src/os/WBThrottle.cc                               |     3 +-
 src/os/WBThrottle.h                                |     9 +-
 src/os/chain_xattr.cc                              |     8 +-
 src/os/chain_xattr.h                               |     6 +-
 src/os/fs/FS.cc                                    |    41 +-
 src/os/fs/XFS.h                                    |     2 +-
 src/os/newstore/NewStore.cc                        |    73 +-
 src/os/newstore/NewStore.h                         |    11 +-
 src/osd/ClassHandler.h                             |     2 +-
 src/osd/ECBackend.cc                               |    22 +-
 src/osd/ECBackend.h                                |     1 +
 src/osd/ECUtil.cc                                  |    16 +
 src/osd/ECUtil.h                                   |    17 +-
 src/osd/Makefile.am                                |    12 +-
 src/osd/OSD.cc                                     |   803 +-
 src/osd/OSD.h                                      |   126 +-
 src/osd/OSDMap.cc                                  |    34 +-
 src/osd/OSDMap.h                                   |    17 +-
 src/osd/OpRequest.cc                               |     2 +
 src/osd/PG.cc                                      |   164 +-
 src/osd/PG.h                                       |    16 +-
 src/osd/PGBackend.cc                               |     7 +-
 src/osd/PGBackend.h                                |     9 +
 src/osd/PGLog.cc                                   |    21 +-
 src/osd/PGLog.h                                    |    22 +-
 src/osd/ReplicatedBackend.cc                       |    37 +-
 src/osd/ReplicatedPG.cc                            |   770 +-
 src/osd/ReplicatedPG.h                             |    30 +-
 src/osd/TierAgentState.h                           |     4 -
 src/osd/osd_types.cc                               |   273 +-
 src/osd/osd_types.h                                |   294 +-
 src/osdc/ObjectCacher.cc                           |    66 +-
 src/osdc/ObjectCacher.h                            |    38 +-
 src/osdc/Objecter.cc                               |    54 +-
 src/osdc/Objecter.h                                |    31 +-
 src/osdc/WritebackHandler.h                        |     5 +-
 src/pybind/Makefile.am                             |    51 +
 src/pybind/cephfs.py                               |    13 +
 src/pybind/rados.py                                |   358 +-
 src/pybind/rbd.py                                  |  1121 --
 src/pybind/rbd.pyx                                 |  1426 ++
 src/pybind/setup.py                                |    51 +
 src/rbd.cc                                         |  4115 ----
 src/rbd_replay/ActionTypes.h                       |     2 +-
 src/rbd_replay/ios.hpp                             |     2 +-
 src/rbdmap                                         |   117 +-
 src/rgw/Makefile.am                                |     4 +-
 src/rgw/rgw_acl.cc                                 |    18 +-
 src/rgw/rgw_acl.h                                  |    50 +-
 src/rgw/rgw_acl_s3.cc                              |    23 +-
 src/rgw/rgw_acl_swift.cc                           |    35 +-
 src/rgw/rgw_acl_swift.h                            |     6 +-
 src/rgw/rgw_admin.cc                               |   139 +-
 src/rgw/rgw_auth_s3.cc                             |     3 +
 src/rgw/rgw_basic_types.cc                         |    14 +
 src/rgw/rgw_basic_types.h                          |   111 +
 src/rgw/rgw_bucket.cc                              |   178 +-
 src/rgw/rgw_bucket.h                               |    39 +-
 src/rgw/rgw_civetweb.cc                            |     7 +
 src/rgw/rgw_client_io.h                            |    63 +
 src/rgw/rgw_common.cc                              |    87 +-
 src/rgw/rgw_common.h                               |   109 +-
 src/rgw/rgw_dencoder.cc                            |    18 +-
 src/rgw/rgw_formats.cc                             |    49 +-
 src/rgw/rgw_formats.h                              |     3 +-
 src/rgw/rgw_http_client.cc                         |     2 +-
 src/rgw/rgw_http_errors.h                          |     1 +
 src/rgw/rgw_json_enc.cc                            |    37 +-
 src/rgw/rgw_log.cc                                 |    21 +-
 src/rgw/rgw_log.h                                  |    22 +-
 src/rgw/rgw_main.cc                                |    11 +-
 src/rgw/rgw_metadata.cc                            |     6 +-
 src/rgw/rgw_metadata.h                             |    15 +
 src/rgw/rgw_object_expirer.cc                      |     2 +-
 src/rgw/rgw_object_expirer_core.cc                 |    19 +-
 src/rgw/rgw_object_expirer_core.h                  |     3 +-
 src/rgw/rgw_op.cc                                  |   802 +-
 src/rgw/rgw_op.h                                   |   250 +-
 src/rgw/rgw_quota.cc                               |   149 +-
 src/rgw/rgw_quota.h                                |     4 +-
 src/rgw/rgw_rados.cc                               |   184 +-
 src/rgw/rgw_rados.h                                |    68 +-
 src/rgw/rgw_resolve.cc                             |    31 +-
 src/rgw/rgw_rest.cc                                |   147 +-
 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                             |   252 +-
 src/rgw/rgw_rest_s3.h                              |    21 +
 src/rgw/rgw_rest_swift.cc                          |   295 +-
 src/rgw/rgw_rest_swift.h                           |    15 +
 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_tools.cc                               |     5 +-
 src/rgw/rgw_usage.cc                               |     4 +-
 src/rgw/rgw_usage.h                                |     4 +-
 src/rgw/rgw_user.cc                                |   134 +-
 src/rgw/rgw_user.h                                 |    48 +-
 src/rocksdb/.arcconfig                             |    17 +
 src/rocksdb/.clang-format                          |     5 +
 src/rocksdb/.gitignore                             |    39 +-
 src/rocksdb/.travis.yml                            |    43 +
 src/rocksdb/CMakeLists.txt                         |   386 +
 src/rocksdb/DUMP_FORMAT.md                         |    16 +
 src/rocksdb/HISTORY.md                             |    82 +-
 src/rocksdb/INSTALL.md                             |     7 +-
 src/rocksdb/Makefile                               |  1165 ++
 src/rocksdb/Makefile.am                            |   383 -
 src/rocksdb/ROCKSDB_LITE.md                        |     1 +
 src/rocksdb/USERS.md                               |     5 +-
 src/rocksdb/Vagrantfile                            |    33 +
 src/rocksdb/WINDOWS_PORT.md                        |   228 +
 src/rocksdb/appveyor.yml                           |    11 +
 src/rocksdb/appveyordailytests.yml                 |    22 +
 .../arcanist_util/__phutil_library_init__.php      |     3 +
 .../arcanist_util/__phutil_library_map__.php       |    38 +
 .../config/FacebookArcanistConfiguration.php       |    35 +
 .../cpp_linter/ArcanistCpplintLinter.php           |    88 +
 .../cpp_linter/BaseDirectoryScopedFormatLinter.php |    74 +
 .../cpp_linter/FacebookHowtoevenLinter.php         |   223 +
 .../cpp_linter/FbcodeClangFormatLinter.php         |    58 +
 .../arcanist_util/cpp_linter/FbcodeCppLinter.php   |   123 +
 src/rocksdb/arcanist_util/cpp_linter/cpplint.py    |  4767 +++++
 .../lint_engine/FacebookFbcodeLintEngine.php       |   140 +
 .../lint_engine/FacebookHowtoevenLintEngine.php    |    27 +
 .../unit_engine/FacebookFbcodeUnitTestEngine.php   |    21 +
 src/rocksdb/build_tools/amalgamate.py              |   110 +
 src/rocksdb/build_tools/build_detect_platform      |   391 +
 src/rocksdb/build_tools/dockerbuild.sh             |     2 +
 src/rocksdb/build_tools/fb_compile_mongo.sh        |    55 +
 src/rocksdb/build_tools/fbcode_config.sh           |   133 +
 src/rocksdb/build_tools/fbcode_config4.8.1.sh      |   110 +
 src/rocksdb/build_tools/format-diff.sh             |   113 +
 src/rocksdb/build_tools/make_new_version.sh        |    46 +
 src/rocksdb/build_tools/make_package.sh            |   116 +
 src/rocksdb/build_tools/regression_build_test.sh   |   428 +
 src/rocksdb/build_tools/rocksdb-lego-determinator  |   587 +
 src/rocksdb/build_tools/run_ci_db_test.ps1         |   252 +
 src/rocksdb/build_tools/version.sh                 |    14 +
 src/rocksdb/configure.ac                           |    87 -
 src/rocksdb/coverage/coverage_test.sh              |    78 +
 src/rocksdb/coverage/parse_gcov_output.py          |   118 +
 src/rocksdb/db/builder.cc                          |   238 +-
 src/rocksdb/db/builder.h                           |    10 +-
 src/rocksdb/db/c.cc                                |   406 +-
 src/rocksdb/db/c_test.c                            |   224 +-
 src/rocksdb/db/column_family.cc                    |   231 +-
 src/rocksdb/db/column_family.h                     |    26 +-
 src/rocksdb/db/column_family_test.cc               |   324 +-
 src/rocksdb/db/compact_files_test.cc               |    28 +-
 src/rocksdb/db/compacted_db_impl.cc                |   163 +
 src/rocksdb/db/compacted_db_impl.h                 |    95 +
 src/rocksdb/db/compaction.cc                       |   144 +-
 src/rocksdb/db/compaction.h                        |    66 +-
 src/rocksdb/db/compaction_iterator.cc              |   338 +
 src/rocksdb/db/compaction_iterator.h               |   138 +
 src/rocksdb/db/compaction_iterator_test.cc         |    71 +
 src/rocksdb/db/compaction_job.cc                   |  1597 +-
 src/rocksdb/db/compaction_job.h                    |    94 +-
 src/rocksdb/db/compaction_job_stats_test.cc        |  1045 +
 src/rocksdb/db/compaction_job_test.cc              |   654 +-
 src/rocksdb/db/compaction_picker.cc                |   171 +-
 src/rocksdb/db/compaction_picker.h                 |    30 +-
 src/rocksdb/db/compaction_picker_test.cc           |   407 +-
 src/rocksdb/db/comparator_db_test.cc               |    24 +-
 src/rocksdb/db/convenience.cc                      |    23 +
 src/rocksdb/db/corruption_test.cc                  |    59 +-
 src/rocksdb/db/cuckoo_table_db_test.cc             |    16 +-
 src/rocksdb/db/db_bench.cc                         |   998 +-
 src/rocksdb/db/db_compaction_filter_test.cc        |   586 +
 src/rocksdb/db/db_compaction_test.cc               |  1858 ++
 src/rocksdb/db/db_dynamic_level_test.cc            |   497 +
 src/rocksdb/db/db_filesnapshot.cc                  |     2 +
 src/rocksdb/db/db_impl.cc                          |  1857 +-
 src/rocksdb/db/db_impl.h                           |   250 +-
 src/rocksdb/db/db_impl_debug.cc                    |    18 +-
 src/rocksdb/db/db_impl_experimental.cc             |     7 +-
 src/rocksdb/db/db_impl_readonly.cc                 |     3 +-
 src/rocksdb/db/db_impl_readonly.h                  |    18 +-
 src/rocksdb/db/db_inplace_update_test.cc           |   171 +
 src/rocksdb/db/db_iter.cc                          |   188 +-
 src/rocksdb/db/db_iter_test.cc                     |   906 +-
 src/rocksdb/db/db_log_iter_test.cc                 |   290 +
 src/rocksdb/db/db_tailing_iter_test.cc             |   659 +
 src/rocksdb/db/db_test.cc                          | 19658 ++++++++-----------
 src/rocksdb/db/db_universal_compaction_test.cc     |  1223 ++
 src/rocksdb/db/db_wal_test.cc                      |   144 +
 src/rocksdb/db/dbformat.cc                         |    20 +-
 src/rocksdb/db/dbformat.h                          |    80 +-
 src/rocksdb/db/dbformat_test.cc                    |    19 +
 src/rocksdb/db/deletefile_test.cc                  |    36 +-
 src/rocksdb/db/event_helpers.cc                    |   108 +
 src/rocksdb/db/event_helpers.h                     |    33 +
 src/rocksdb/db/event_logger_helpers.cc             |    46 -
 src/rocksdb/db/event_logger_helpers.h              |    18 -
 src/rocksdb/db/fault_injection_test.cc             |   206 +-
 src/rocksdb/db/file_indexer.h                      |     4 +-
 src/rocksdb/db/filename.cc                         |    43 +-
 src/rocksdb/db/filename.h                          |    16 +-
 src/rocksdb/db/flush_job.cc                        |   123 +-
 src/rocksdb/db/flush_job.h                         |    21 +-
 src/rocksdb/db/flush_job_test.cc                   |    98 +-
 src/rocksdb/db/forward_iterator.cc                 |   188 +-
 src/rocksdb/db/forward_iterator.h                  |    26 +-
 src/rocksdb/db/internal_stats.cc                   |   240 +-
 src/rocksdb/db/internal_stats.h                    |   127 +-
 src/rocksdb/db/job_context.h                       |     5 +
 src/rocksdb/db/listener_test.cc                    |   133 +-
 src/rocksdb/db/log_reader.cc                       |    27 +-
 src/rocksdb/db/log_reader.h                        |    14 +-
 src/rocksdb/db/log_test.cc                         |   136 +-
 src/rocksdb/db/log_writer.cc                       |     6 +-
 src/rocksdb/db/log_writer.h                        |    16 +-
 src/rocksdb/db/managed_iterator.cc                 |     1 +
 src/rocksdb/db/memtable.cc                         |   115 +-
 src/rocksdb/db/memtable.h                          |    45 +-
 src/rocksdb/db/memtable_list.cc                    |   163 +-
 src/rocksdb/db/memtable_list.h                     |   105 +-
 src/rocksdb/db/memtable_list_test.cc               |   295 +-
 src/rocksdb/db/memtablerep_bench.cc                |     9 +-
 src/rocksdb/db/merge_helper.cc                     |   259 +-
 src/rocksdb/db/merge_helper.h                      |   104 +-
 src/rocksdb/db/merge_helper_test.cc                |   289 +
 src/rocksdb/db/merge_operator.cc                   |     4 +-
 src/rocksdb/db/merge_test.cc                       |    21 +-
 src/rocksdb/db/plain_table_db_test.cc              |   108 +-
 src/rocksdb/db/prefix_test.cc                      |    18 +-
 src/rocksdb/db/repair.cc                           |    29 +-
 src/rocksdb/db/skiplist.h                          |   134 +-
 src/rocksdb/db/snapshot.h                          |   111 -
 src/rocksdb/db/snapshot_impl.cc                    |    23 +
 src/rocksdb/db/snapshot_impl.h                     |   111 +
 src/rocksdb/db/table_cache.cc                      |   205 +-
 src/rocksdb/db/table_cache.h                       |    17 +-
 src/rocksdb/db/table_properties_collector.cc       |     8 +-
 src/rocksdb/db/table_properties_collector.h        |     8 +-
 src/rocksdb/db/table_properties_collector_test.cc  |   197 +-
 src/rocksdb/db/transaction_log_impl.cc             |    19 +-
 src/rocksdb/db/transaction_log_impl.h              |     7 +-
 src/rocksdb/db/version_builder.cc                  |    48 +-
 src/rocksdb/db/version_builder.h                   |     3 +-
 src/rocksdb/db/version_builder_test.cc             |    33 +-
 src/rocksdb/db/version_edit.cc                     |    74 +-
 src/rocksdb/db/version_edit.h                      |    25 +-
 src/rocksdb/db/version_edit_test.cc                |     7 +-
 src/rocksdb/db/version_set.cc                      |   598 +-
 src/rocksdb/db/version_set.h                       |    82 +-
 src/rocksdb/db/version_set_test.cc                 |    23 +
 src/rocksdb/db/wal_manager.cc                      |    19 +-
 src/rocksdb/db/wal_manager_test.cc                 |    21 +-
 src/rocksdb/db/write_batch.cc                      |   231 +-
 src/rocksdb/db/write_batch_base.cc                 |    30 +
 src/rocksdb/db/write_batch_internal.h              |    13 +
 src/rocksdb/db/write_batch_test.cc                 |   294 +-
 src/rocksdb/db/write_callback.h                    |    24 +
 src/rocksdb/db/write_callback_test.cc              |   129 +
 src/rocksdb/db/write_controller.cc                 |    86 +-
 src/rocksdb/db/write_controller.h                  |    41 +-
 src/rocksdb/db/write_controller_test.cc            |    73 +-
 src/rocksdb/db/write_thread.cc                     |   227 +-
 src/rocksdb/db/write_thread.h                      |   146 +-
 src/rocksdb/examples/.gitignore                    |     7 +-
 src/rocksdb/examples/Makefile                      |    26 +-
 src/rocksdb/examples/c_simple_example.c            |     2 +-
 src/rocksdb/examples/compact_files_example.cc      |    48 +-
 src/rocksdb/examples/compaction_filter_example.cc  |    84 +
 .../examples/optimistic_transaction_example.cc     |   142 +
 .../examples/rocksdb_option_file_example.ini       |    53 +
 src/rocksdb/examples/transaction_example.cc        |   144 +
 src/rocksdb/hdfs/env_hdfs.h                        |    26 +-
 src/rocksdb/include/rocksdb/c.h                    |  1173 +-
 src/rocksdb/include/rocksdb/cache.h                |     6 +
 src/rocksdb/include/rocksdb/compaction_filter.h    |   116 +-
 src/rocksdb/include/rocksdb/compaction_job_stats.h |    85 +
 src/rocksdb/include/rocksdb/comparator.h           |     9 +
 src/rocksdb/include/rocksdb/convenience.h          |    83 +
 src/rocksdb/include/rocksdb/db.h                   |   219 +-
 src/rocksdb/include/rocksdb/db_dump_tool.h         |    45 +
 src/rocksdb/include/rocksdb/delete_scheduler.h     |    66 +
 src/rocksdb/include/rocksdb/env.h                  |   238 +-
 src/rocksdb/include/rocksdb/immutable_options.h    |    10 +-
 src/rocksdb/include/rocksdb/iostats_context.h      |    31 +-
 src/rocksdb/include/rocksdb/listener.h             |   130 +-
 src/rocksdb/include/rocksdb/memtablerep.h          |     5 +
 src/rocksdb/include/rocksdb/merge_operator.h       |    13 +-
 src/rocksdb/include/rocksdb/metadata.h             |     6 +-
 src/rocksdb/include/rocksdb/options.h              |   259 +-
 src/rocksdb/include/rocksdb/perf_context.h         |    51 +-
 src/rocksdb/include/rocksdb/perf_level.h           |    30 +
 src/rocksdb/include/rocksdb/rate_limiter.h         |     2 +-
 src/rocksdb/include/rocksdb/slice.h                |    26 +-
 src/rocksdb/include/rocksdb/snapshot.h             |    45 +
 src/rocksdb/include/rocksdb/sst_file_writer.h      |    77 +
 src/rocksdb/include/rocksdb/statistics.h           |    88 +-
 src/rocksdb/include/rocksdb/status.h               |   136 +-
 src/rocksdb/include/rocksdb/table.h                |    31 +-
 src/rocksdb/include/rocksdb/table_properties.h     |    21 +-
 src/rocksdb/include/rocksdb/thread_status.h        |    10 +-
 src/rocksdb/include/rocksdb/transaction_log.h      |    21 +
 src/rocksdb/include/rocksdb/universal_compaction.h |     8 +-
 .../include/rocksdb/utilities/backupable_db.h      |    54 +-
 src/rocksdb/include/rocksdb/utilities/checkpoint.h |     2 +
 .../include/rocksdb/utilities/convenience.h        |    57 +-
 .../include/rocksdb/utilities/info_log_finder.h    |    19 +
 .../rocksdb/utilities/optimistic_transaction_db.h  |    72 +
 src/rocksdb/include/rocksdb/utilities/spatial_db.h |    49 +-
 .../include/rocksdb/utilities/stackable_db.h       |    54 +-
 .../utilities/table_properties_collectors.h        |    29 +
 .../include/rocksdb/utilities/transaction.h        |   307 +
 .../include/rocksdb/utilities/transaction_db.h     |   137 +
 .../rocksdb/utilities/transaction_db_mutex.h       |    92 +
 src/rocksdb/include/rocksdb/utilities/utility_db.h |     7 +-
 .../rocksdb/utilities/write_batch_with_index.h     |    60 +-
 src/rocksdb/include/rocksdb/version.h              |     6 +-
 src/rocksdb/include/rocksdb/write_batch.h          |    84 +-
 src/rocksdb/include/rocksdb/write_batch_base.h     |    27 +
 src/rocksdb/include/utilities/backupable_db.h      |    12 -
 src/rocksdb/include/utilities/db_ttl.h             |     8 -
 src/rocksdb/include/utilities/document_db.h        |     8 -
 src/rocksdb/include/utilities/geo_db.h             |     8 -
 src/rocksdb/include/utilities/json_document.h      |     7 -
 src/rocksdb/include/utilities/stackable_db.h       |     7 -
 src/rocksdb/include/utilities/utility_db.h         |     7 -
 src/rocksdb/java/HISTORY-JAVA.md                   |    86 +
 src/rocksdb/java/Makefile                          |   190 +
 src/rocksdb/java/RELEASE.md                        |    54 +
 .../java/org/rocksdb/benchmark/DbBenchmark.java    |  1624 ++
 src/rocksdb/java/crossbuild/Vagrantfile            |    26 +
 src/rocksdb/java/crossbuild/build-linux-centos.sh  |    24 +
 src/rocksdb/java/crossbuild/build-linux.sh         |    14 +
 src/rocksdb/java/jdb_bench.sh                      |    10 +
 src/rocksdb/java/rocksjni.pom                      |   145 +
 src/rocksdb/java/rocksjni/backupablejni.cc         |   330 +
 src/rocksdb/java/rocksjni/backupenginejni.cc       |   216 +
 src/rocksdb/java/rocksjni/checkpoint.cc            |    61 +
 src/rocksdb/java/rocksjni/columnfamilyhandle.cc    |    25 +
 src/rocksdb/java/rocksjni/compaction_filter.cc     |    24 +
 src/rocksdb/java/rocksjni/comparator.cc            |    66 +
 src/rocksdb/java/rocksjni/comparatorjnicallback.cc |   176 +
 src/rocksdb/java/rocksjni/comparatorjnicallback.h  |    95 +
 src/rocksdb/java/rocksjni/env.cc                   |    79 +
 src/rocksdb/java/rocksjni/filter.cc                |    46 +
 src/rocksdb/java/rocksjni/iterator.cc              |   144 +
 src/rocksdb/java/rocksjni/loggerjnicallback.cc     |   195 +
 src/rocksdb/java/rocksjni/loggerjnicallback.h      |    44 +
 src/rocksdb/java/rocksjni/memtablejni.cc           |    90 +
 src/rocksdb/java/rocksjni/merge_operator.cc        |    37 +
 src/rocksdb/java/rocksjni/options.cc               |  4089 ++++
 src/rocksdb/java/rocksjni/portal.h                 |   833 +
 src/rocksdb/java/rocksjni/ratelimiterjni.cc        |    24 +
 .../remove_emptyvalue_compactionfilterjni.cc       |    27 +
 src/rocksdb/java/rocksjni/restorejni.cc            |   203 +
 src/rocksdb/java/rocksjni/rocksjni.cc              |  1653 ++
 src/rocksdb/java/rocksjni/slice.cc                 |   259 +
 src/rocksdb/java/rocksjni/snapshot.cc              |    26 +
 src/rocksdb/java/rocksjni/statistics.cc            |    50 +
 src/rocksdb/java/rocksjni/table.cc                 |    89 +
 src/rocksdb/java/rocksjni/transaction_log.cc       |    78 +
 src/rocksdb/java/rocksjni/ttl.cc                   |   183 +
 src/rocksdb/java/rocksjni/write_batch.cc           |   238 +
 src/rocksdb/java/rocksjni/write_batch_test.cc      |   148 +
 .../java/rocksjni/write_batch_with_index.cc        |   386 +
 .../java/rocksjni/writebatchhandlerjnicallback.cc  |   104 +
 .../java/rocksjni/writebatchhandlerjnicallback.h   |    46 +
 .../src/main/java/RocksDBColumnFamilySample.java   |    95 +
 .../java/samples/src/main/java/RocksDBSample.java  |   312 +
 .../java/org/rocksdb/AbstractCompactionFilter.java |    29 +
 .../main/java/org/rocksdb/AbstractComparator.java  |   100 +
 .../java/org/rocksdb/AbstractRocksIterator.java    |   106 +
 .../src/main/java/org/rocksdb/AbstractSlice.java   |   171 +
 .../main/java/org/rocksdb/AbstractWriteBatch.java  |    92 +
 .../src/main/java/org/rocksdb/BackupEngine.java    |   222 +
 .../java/src/main/java/org/rocksdb/BackupInfo.java |    67 +
 .../src/main/java/org/rocksdb/BackupableDB.java    |   166 +
 .../main/java/org/rocksdb/BackupableDBOptions.java |   271 +
 .../java/org/rocksdb/BlockBasedTableConfig.java    |   425 +
 .../src/main/java/org/rocksdb/BloomFilter.java     |    89 +
 .../main/java/org/rocksdb/BuiltinComparator.java   |    20 +
 .../java/src/main/java/org/rocksdb/Checkpoint.java |    72 +
 .../src/main/java/org/rocksdb/ChecksumType.java    |    39 +
 .../java/org/rocksdb/ColumnFamilyDescriptor.java   |    61 +
 .../main/java/org/rocksdb/ColumnFamilyHandle.java  |    45 +
 .../main/java/org/rocksdb/ColumnFamilyOptions.java |   820 +
 .../org/rocksdb/ColumnFamilyOptionsInterface.java  |  1182 ++
 .../src/main/java/org/rocksdb/CompactionStyle.java |    52 +
 .../java/src/main/java/org/rocksdb/Comparator.java |    24 +
 .../main/java/org/rocksdb/ComparatorOptions.java   |    57 +
 .../src/main/java/org/rocksdb/CompressionType.java |    94 +
 .../java/src/main/java/org/rocksdb/DBOptions.java  |   655 +
 .../main/java/org/rocksdb/DBOptionsInterface.java  |   764 +
 .../main/java/org/rocksdb/DirectComparator.java    |    24 +
 .../src/main/java/org/rocksdb/DirectSlice.java     |   118 +
 .../src/main/java/org/rocksdb/EncodingType.java    |    55 +
 .../java/src/main/java/org/rocksdb/Env.java        |    92 +
 .../java/src/main/java/org/rocksdb/Filter.java     |    31 +
 .../src/main/java/org/rocksdb/FlushOptions.java    |    51 +
 .../java/org/rocksdb/GenericRateLimiterConfig.java |    66 +
 .../org/rocksdb/HashLinkedListMemTableConfig.java  |   173 +
 .../org/rocksdb/HashSkipListMemTableConfig.java    |   105 +
 .../src/main/java/org/rocksdb/HistogramData.java   |    44 +
 .../src/main/java/org/rocksdb/HistogramType.java   |    40 +
 .../java/src/main/java/org/rocksdb/IndexType.java  |    37 +
 .../src/main/java/org/rocksdb/InfoLogLevel.java    |    47 +
 .../java/src/main/java/org/rocksdb/Logger.java     |   108 +
 .../src/main/java/org/rocksdb/MemTableConfig.java  |    29 +
 .../src/main/java/org/rocksdb/MergeOperator.java   |    15 +
 .../main/java/org/rocksdb/NativeLibraryLoader.java |   114 +
 .../java/src/main/java/org/rocksdb/Options.java    |  1328 ++
 .../main/java/org/rocksdb/PlainTableConfig.java    |   251 +
 .../main/java/org/rocksdb/RateLimiterConfig.java   |    23 +
 .../src/main/java/org/rocksdb/ReadOptions.java     |   163 +
 .../rocksdb/RemoveEmptyValueCompactionFilter.java  |    18 +
 .../main/java/org/rocksdb/RestoreBackupableDB.java |   166 +
 .../src/main/java/org/rocksdb/RestoreOptions.java  |    41 +
 .../java/src/main/java/org/rocksdb/RocksDB.java    |  1824 ++
 .../main/java/org/rocksdb/RocksDBException.java    |    21 +
 .../java/src/main/java/org/rocksdb/RocksEnv.java   |    43 +
 .../src/main/java/org/rocksdb/RocksIterator.java   |    64 +
 .../java/org/rocksdb/RocksIteratorInterface.java   |    80 +
 .../src/main/java/org/rocksdb/RocksMemEnv.java     |    33 +
 .../src/main/java/org/rocksdb/RocksObject.java     |   125 +
 .../java/org/rocksdb/SkipListMemTableConfig.java   |    50 +
 .../java/src/main/java/org/rocksdb/Slice.java      |    88 +
 .../java/src/main/java/org/rocksdb/Snapshot.java   |    37 +
 .../java/src/main/java/org/rocksdb/Statistics.java |    37 +
 .../main/java/org/rocksdb/StatisticsCollector.java |   107 +
 .../org/rocksdb/StatisticsCollectorCallback.java   |    32 +
 .../main/java/org/rocksdb/StatsCollectorInput.java |    35 +
 .../java/org/rocksdb/StringAppendOperator.java     |    17 +
 .../main/java/org/rocksdb/TableFormatConfig.java   |    22 +
 .../java/src/main/java/org/rocksdb/TickerType.java |   137 +
 .../java/org/rocksdb/TransactionLogIterator.java   |   116 +
 .../java/src/main/java/org/rocksdb/TtlDB.java      |   197 +
 .../java/org/rocksdb/VectorMemTableConfig.java     |    45 +
 .../main/java/org/rocksdb/WBWIRocksIterator.java   |   149 +
 .../java/src/main/java/org/rocksdb/WriteBatch.java |   126 +
 .../main/java/org/rocksdb/WriteBatchInterface.java |    98 +
 .../main/java/org/rocksdb/WriteBatchWithIndex.java |   149 +
 .../src/main/java/org/rocksdb/WriteOptions.java    |   106 +
 .../main/java/org/rocksdb/util/Environment.java    |    59 +
 .../src/main/java/org/rocksdb/util/SizeUnit.java   |    16 +
 .../java/org/rocksdb/AbstractComparatorTest.java   |   217 +
 .../test/java/org/rocksdb/BackupEngineTest.java    |   305 +
 .../java/org/rocksdb/BackupableDBOptionsTest.java  |   283 +
 .../test/java/org/rocksdb/BackupableDBTest.java    |   425 +
 .../org/rocksdb/BlockBasedTableConfigTest.java     |   185 +
 .../src/test/java/org/rocksdb/CheckPointTest.java  |    97 +
 .../java/org/rocksdb/ColumnFamilyOptionsTest.java  |   745 +
 .../test/java/org/rocksdb/ColumnFamilyTest.java    |   746 +
 .../java/org/rocksdb/ComparatorOptionsTest.java    |    35 +
 .../src/test/java/org/rocksdb/ComparatorTest.java  |   227 +
 .../java/org/rocksdb/CompressionOptionsTest.java   |    21 +
 .../src/test/java/org/rocksdb/DBOptionsTest.java   |   570 +
 .../java/org/rocksdb/DirectComparatorTest.java     |    52 +
 .../src/test/java/org/rocksdb/DirectSliceTest.java |   106 +
 .../java/src/test/java/org/rocksdb/FilterTest.java |    47 +
 .../java/src/test/java/org/rocksdb/FlushTest.java  |    65 +
 .../test/java/org/rocksdb/InfoLogLevelTest.java    |   134 +
 .../src/test/java/org/rocksdb/KeyMayExistTest.java |    95 +
 .../java/src/test/java/org/rocksdb/LoggerTest.java |   220 +
 .../src/test/java/org/rocksdb/MemTableTest.java    |   137 +
 .../java/src/test/java/org/rocksdb/MergeTest.java  |   302 +
 .../test/java/org/rocksdb/MixedOptionsTest.java    |    56 +
 .../java/org/rocksdb/NativeLibraryLoaderTest.java  |    31 +
 .../src/test/java/org/rocksdb/OptionsTest.java     |  1208 ++
 .../java/org/rocksdb/PlainTableConfigTest.java     |    95 +
 .../java/org/rocksdb/PlatformRandomHelper.java     |    58 +
 .../src/test/java/org/rocksdb/ReadOnlyTest.java    |   365 +
 .../src/test/java/org/rocksdb/ReadOptionsTest.java |   151 +
 .../src/test/java/org/rocksdb/RocksDBTest.java     |   809 +
 .../src/test/java/org/rocksdb/RocksEnvTest.java    |    38 +
 .../test/java/org/rocksdb/RocksIteratorTest.java   |    72 +
 .../src/test/java/org/rocksdb/RocksMemEnvTest.java |   196 +
 .../test/java/org/rocksdb/RocksMemoryResource.java |    20 +
 .../java/src/test/java/org/rocksdb/SliceTest.java  |   105 +
 .../src/test/java/org/rocksdb/SnapshotTest.java    |   217 +
 .../java/org/rocksdb/StatisticsCollectorTest.java  |    60 +
 .../test/java/org/rocksdb/StatsCallbackMock.java   |    20 +
 .../org/rocksdb/TransactionLogIteratorTest.java    |   182 +
 .../java/src/test/java/org/rocksdb/TtlDBTest.java  |   166 +
 .../java/src/test/java/org/rocksdb/Types.java      |    43 +
 .../java/org/rocksdb/WriteBatchHandlerTest.java    |   170 +
 .../src/test/java/org/rocksdb/WriteBatchTest.java  |   123 +
 .../java/org/rocksdb/WriteBatchWithIndexTest.java  |   268 +
 .../test/java/org/rocksdb/WriteOptionsTest.java    |    31 +
 .../java/org/rocksdb/test/RocksJunitRunner.java    |    68 +
 .../java/org/rocksdb/util/EnvironmentTest.java     |   171 +
 .../test/java/org/rocksdb/util/SizeUnitTest.java   |    27 +
 src/rocksdb/m4/libtool.m4                          |  7997 --------
 src/rocksdb/m4/ltoptions.m4                        |   384 -
 src/rocksdb/m4/ltsugar.m4                          |   123 -
 src/rocksdb/m4/ltversion.m4                        |    23 -
 src/rocksdb/m4/lt~obsolete.m4                      |    98 -
 src/rocksdb/port/dirent.h                          |    47 +
 src/rocksdb/port/port.h                            |     2 +
 src/rocksdb/port/port_posix.cc                     |    28 +-
 src/rocksdb/port/port_posix.h                      |    20 +-
 src/rocksdb/port/sys_time.h                        |    48 +
 src/rocksdb/port/util_logger.h                     |    23 +
 src/rocksdb/port/win/env_win.cc                    |  2099 ++
 src/rocksdb/port/win/port_win.cc                   |   315 +
 src/rocksdb/port/win/port_win.h                    |   250 +
 src/rocksdb/port/win/stdint.h                      |    24 -
 src/rocksdb/port/win/win_logger.cc                 |   154 +
 src/rocksdb/port/win/win_logger.h                  |    57 +
 src/rocksdb/src.mk                                 |   312 +
 src/rocksdb/table/adaptive_table_factory.cc        |    16 +-
 src/rocksdb/table/adaptive_table_factory.h         |    15 +-
 src/rocksdb/table/block.cc                         |     4 +-
 src/rocksdb/table/block.h                          |    11 +
 src/rocksdb/table/block_based_filter_block.cc      |    12 +-
 src/rocksdb/table/block_based_table_builder.cc     |    39 +-
 src/rocksdb/table/block_based_table_builder.h      |     7 +-
 src/rocksdb/table/block_based_table_factory.cc     |    30 +-
 src/rocksdb/table/block_based_table_factory.h      |    22 +-
 src/rocksdb/table/block_based_table_reader.cc      |   178 +-
 src/rocksdb/table/block_based_table_reader.h       |    10 +-
 src/rocksdb/table/block_hash_index.cc              |     6 +-
 src/rocksdb/table/block_prefix_index.h             |     1 +
 src/rocksdb/table/cuckoo_table_builder.cc          |     3 +-
 src/rocksdb/table/cuckoo_table_builder.h           |    18 +-
 src/rocksdb/table/cuckoo_table_builder_test.cc     |   267 +-
 src/rocksdb/table/cuckoo_table_factory.cc          |    13 +-
 src/rocksdb/table/cuckoo_table_factory.h           |    17 +-
 src/rocksdb/table/cuckoo_table_reader.cc           |     9 +-
 src/rocksdb/table/cuckoo_table_reader.h            |    14 +-
 src/rocksdb/table/cuckoo_table_reader_test.cc      |    85 +-
 src/rocksdb/table/format.cc                        |    22 +-
 src/rocksdb/table/format.h                         |    15 +-
 src/rocksdb/table/full_filter_block.cc             |     9 +-
 src/rocksdb/table/get_context.cc                   |    54 +-
 src/rocksdb/table/get_context.h                    |     9 +
 src/rocksdb/table/iter_heap.h                      |    16 +-
 src/rocksdb/table/merger.cc                        |   204 +-
 src/rocksdb/table/merger_test.cc                   |    36 +-
 src/rocksdb/table/meta_blocks.cc                   |    14 +-
 src/rocksdb/table/meta_blocks.h                    |    36 +-
 src/rocksdb/table/mock_table.cc                    |    49 +-
 src/rocksdb/table/mock_table.h                     |    57 +-
 src/rocksdb/table/plain_table_builder.cc           |    10 +-
 src/rocksdb/table/plain_table_builder.h            |    11 +-
 src/rocksdb/table/plain_table_factory.cc           |    25 +-
 src/rocksdb/table/plain_table_factory.h            |    15 +-
 src/rocksdb/table/plain_table_index.cc             |     4 +-
 src/rocksdb/table/plain_table_key_coding.cc        |   309 +-
 src/rocksdb/table/plain_table_key_coding.h         |    72 +-
 src/rocksdb/table/plain_table_reader.cc            |   157 +-
 src/rocksdb/table/plain_table_reader.h             |    29 +-
 src/rocksdb/table/sst_file_writer.cc               |   188 +
 src/rocksdb/table/table_builder.h                  |    19 +
 src/rocksdb/table/table_properties.cc              |    10 +
 src/rocksdb/table/table_reader_bench.cc            |    25 +-
 src/rocksdb/table/table_test.cc                    |   399 +-
 src/rocksdb/table/two_level_iterator.cc            |    29 +-
 src/rocksdb/table/two_level_iterator.h             |     5 +-
 src/rocksdb/third-party/fbson/COMMIT.md            |     3 +
 src/rocksdb/third-party/fbson/FbsonDocument.h      |    17 +-
 src/rocksdb/third-party/fbson/FbsonStream.h        |     4 +
 .../gtest-1.7.0/fused-src/gtest/CMakeLists.txt     |     1 +
 src/rocksdb/thirdparty.inc                         |   169 +
 src/rocksdb/tools/Dockerfile                       |     5 +
 src/rocksdb/tools/auto_sanity_test.sh              |    91 +
 src/rocksdb/tools/benchmark.sh                     |   361 +
 src/rocksdb/tools/benchmark_leveldb.sh             |   185 +
 src/rocksdb/tools/check_format_compatible.sh       |   115 +
 src/rocksdb/tools/db_crashtest.py                  |   203 +
 src/rocksdb/tools/db_crashtest2.py                 |   231 +
 src/rocksdb/tools/db_repl_stress.cc                |   158 +
 src/rocksdb/tools/db_sanity_test.cc                |   294 +
 src/rocksdb/tools/db_stress.cc                     |  2197 +++
 src/rocksdb/tools/dbench_monitor                   |   102 +
 src/rocksdb/tools/dump/db_dump_tool.cc             |   261 +
 src/rocksdb/tools/dump/rocksdb_dump.cc             |    63 +
 src/rocksdb/tools/dump/rocksdb_undump.cc           |    62 +
 src/rocksdb/tools/generate_random_db.sh            |    30 +
 src/rocksdb/tools/ldb.cc                           |    21 +
 src/rocksdb/tools/ldb_test.py                      |   456 +
 src/rocksdb/tools/pflag                            |   217 +
 src/rocksdb/tools/reduce_levels_test.cc            |   217 +
 src/rocksdb/tools/rocksdb_dump_test.sh             |     7 +
 src/rocksdb/tools/run_flash_bench.sh               |   282 +
 src/rocksdb/tools/run_leveldb.sh                   |   174 +
 src/rocksdb/tools/sample-dump.dmp                  |   Bin 0 -> 100 bytes
 src/rocksdb/tools/sst_dump.cc                      |    21 +
 src/rocksdb/tools/verify_random_db.sh              |    27 +
 src/rocksdb/util/aligned_buffer.h                  |   154 +
 src/rocksdb/util/arena.cc                          |    37 +-
 src/rocksdb/util/arena.h                           |     5 +
 src/rocksdb/util/arena_test.cc                     |    53 +-
 src/rocksdb/util/auto_roll_logger.cc               |     2 +-
 src/rocksdb/util/auto_roll_logger.h                |     2 +-
 src/rocksdb/util/auto_roll_logger_test.cc          |   110 +-
 src/rocksdb/util/autovector.h                      |     8 +-
 src/rocksdb/util/autovector_test.cc                |    29 +-
 src/rocksdb/util/bloom_test.cc                     |     4 +-
 src/rocksdb/util/cache.cc                          |    39 +-
 src/rocksdb/util/cache_test.cc                     |    51 +
 src/rocksdb/util/channel.h                         |    67 +
 src/rocksdb/util/compaction_job_stats_impl.cc      |    80 +
 src/rocksdb/util/comparator.cc                     |    22 +-
 src/rocksdb/util/compression.h                     |    99 +
 src/rocksdb/util/crc32c.cc                         |     8 +
 src/rocksdb/util/crc32c.h                          |     2 +
 src/rocksdb/util/db_info_dumper.cc                 |    40 +-
 src/rocksdb/util/db_test_util.cc                   |   981 +
 src/rocksdb/util/db_test_util.h                    |   669 +
 src/rocksdb/util/delete_scheduler_impl.cc          |   231 +
 src/rocksdb/util/delete_scheduler_impl.h           |    81 +
 src/rocksdb/util/delete_scheduler_test.cc          |   469 +
 src/rocksdb/util/dynamic_bloom.h                   |     2 +-
 src/rocksdb/util/dynamic_bloom_test.cc             |     4 +-
 src/rocksdb/util/env.cc                            |    42 +-
 src/rocksdb/util/env_hdfs.cc                       |    26 +-
 src/rocksdb/util/env_posix.cc                      |   549 +-
 src/rocksdb/util/env_test.cc                       |   179 +-
 src/rocksdb/util/event_logger.cc                   |    40 +-
 src/rocksdb/util/event_logger.h                    |    60 +-
 src/rocksdb/util/file_reader_writer.cc             |   471 +
 src/rocksdb/util/file_reader_writer.h              |   166 +
 src/rocksdb/util/file_reader_writer_test.cc        |    92 +
 src/rocksdb/util/file_util.cc                      |    29 +-
 src/rocksdb/util/file_util.h                       |     6 +-
 src/rocksdb/util/hash_cuckoo_rep.cc                |    51 +-
 src/rocksdb/util/hash_linklist_rep.cc              |    15 +-
 src/rocksdb/util/heap.h                            |   140 +
 src/rocksdb/util/heap_test.cc                      |   139 +
 src/rocksdb/util/histogram.h                       |     5 +-
 src/rocksdb/util/iostats_context.cc                |    20 +-
 src/rocksdb/util/iostats_context_imp.h             |     8 +
 src/rocksdb/util/ldb_cmd.cc                        |    83 +-
 src/rocksdb/util/ldb_cmd.h                         |    38 +-
 src/rocksdb/util/ldb_cmd_execute_result.h          |     4 +
 src/rocksdb/util/ldb_cmd_test.cc                   |    44 +
 src/rocksdb/util/log_buffer.cc                     |    12 +-
 src/rocksdb/util/log_buffer.h                      |     2 +-
 src/rocksdb/util/manual_compaction_test.cc         |     5 +-
 src/rocksdb/util/memenv.cc                         |    12 +-
 src/rocksdb/util/memenv_test.cc                    |    22 +-
 src/rocksdb/util/mock_env.cc                       |    20 +-
 src/rocksdb/util/mock_env.h                        |     6 +-
 src/rocksdb/util/mock_env_test.cc                  |    13 +-
 src/rocksdb/util/mutable_cf_options.cc             |    20 +-
 src/rocksdb/util/mutable_cf_options.h              |   127 +-
 src/rocksdb/util/options.cc                        |   390 +-
 src/rocksdb/util/options_helper.cc                 |   774 +-
 src/rocksdb/util/options_helper.h                  |   388 +-
 src/rocksdb/util/options_parser.cc                 |   612 +
 src/rocksdb/util/options_parser.h                  |   124 +
 src/rocksdb/util/options_test.cc                   |  1055 +-
 src/rocksdb/util/perf_context.cc                   |    35 +-
 src/rocksdb/util/perf_context_imp.h                |    48 +-
 src/rocksdb/util/perf_level.cc                     |    27 +
 src/rocksdb/util/perf_level_imp.h                  |    18 +
 src/rocksdb/util/perf_step_timer.h                 |    54 +
 src/rocksdb/util/posix_logger.h                    |     6 +-
 src/rocksdb/util/rate_limiter.cc                   |     4 +-
 src/rocksdb/util/rate_limiter.h                    |     4 +-
 src/rocksdb/util/skiplistrep.cc                    |     9 +
 src/rocksdb/util/slice.cc                          |    33 +
 src/rocksdb/util/sst_dump_test.cc                  |    42 +-
 src/rocksdb/util/sst_dump_tool.cc                  |   149 +-
 src/rocksdb/util/sst_dump_tool_imp.h               |    16 +-
 src/rocksdb/util/statistics.cc                     |    10 +-
 src/rocksdb/util/statistics.h                      |     1 +
 src/rocksdb/util/status.cc                         |    18 +-
 src/rocksdb/util/status_message.cc                 |    17 +
 src/rocksdb/util/stl_wrappers.h                    |    48 +-
 src/rocksdb/util/stop_watch.h                      |     4 +
 src/rocksdb/util/string_util.h                     |     4 +-
 src/rocksdb/util/sync_point.cc                     |    15 +
 src/rocksdb/util/sync_point.h                      |    28 +
 src/rocksdb/util/testutil.cc                       |    31 +
 src/rocksdb/util/testutil.h                        |   258 +
 src/rocksdb/util/thread_local.cc                   |   121 +-
 src/rocksdb/util/thread_local.h                    |    11 +-
 src/rocksdb/util/thread_local_test.cc              |     2 +-
 src/rocksdb/util/thread_operation.h                |     4 +-
 src/rocksdb/util/thread_status_impl.cc             |     2 +-
 src/rocksdb/util/thread_status_updater.cc          |   104 +-
 src/rocksdb/util/thread_status_updater.h           |    29 +-
 src/rocksdb/util/thread_status_util.cc             |     5 +-
 src/rocksdb/util/thread_status_util.h              |     4 +-
 src/rocksdb/util/vectorrep.cc                      |     2 +-
 src/rocksdb/util/xfunc.cc                          |   114 +
 src/rocksdb/util/xfunc.h                           |    10 +
 src/rocksdb/utilities/backupable/backupable_db.cc  |   821 +-
 .../utilities/backupable/backupable_db_test.cc     |   628 +-
 src/rocksdb/utilities/checkpoint/checkpoint.cc     |    53 +-
 .../utilities/checkpoint/checkpoint_test.cc        |   373 +
 .../utilities/compacted_db/compacted_db_impl.cc    |   163 -
 .../utilities/compacted_db/compacted_db_impl.h     |    96 -
 .../remove_emptyvalue_compactionfilter.cc          |    30 +
 .../remove_emptyvalue_compactionfilter.h           |    27 +
 src/rocksdb/utilities/convenience/convenience.cc   |    23 -
 .../utilities/convenience/info_log_finder.cc       |    48 +
 src/rocksdb/utilities/document/document_db_test.cc |    12 +
 src/rocksdb/utilities/document/json_document.cc    |     2 +-
 .../utilities/document/json_document_test.cc       |    12 +
 src/rocksdb/utilities/geodb/geodb_impl.cc          |     7 +
 src/rocksdb/utilities/geodb/geodb_impl.h           |    14 +-
 src/rocksdb/utilities/geodb/geodb_test.cc          |    14 +-
 .../merge_operators/string_append/stringappend2.cc |     2 +-
 .../string_append/stringappend_test.cc             |    12 +-
 src/rocksdb/utilities/merge_operators/uint64add.cc |     4 +-
 src/rocksdb/utilities/redis/redis_lists_test.cc    |    13 +-
 src/rocksdb/utilities/spatialdb/spatial_db.cc      |    46 +-
 src/rocksdb/utilities/spatialdb/spatial_db_test.cc |    28 +
 .../compact_on_deletion_collector.cc               |    93 +
 .../compact_on_deletion_collector.h                |   101 +
 .../compact_on_deletion_collector_test.cc          |   177 +
 .../transactions/optimistic_transaction_db_impl.cc |    80 +
 .../transactions/optimistic_transaction_db_impl.h  |    33 +
 .../transactions/optimistic_transaction_impl.cc    |   109 +
 .../transactions/optimistic_transaction_impl.h     |    80 +
 .../transactions/optimistic_transaction_test.cc    |  1134 ++
 .../utilities/transactions/transaction_base.cc     |   385 +
 .../utilities/transactions/transaction_base.h      |   250 +
 .../utilities/transactions/transaction_db_impl.cc  |   260 +
 .../utilities/transactions/transaction_db_impl.h   |    80 +
 .../transactions/transaction_db_mutex_impl.cc      |   121 +
 .../transactions/transaction_db_mutex_impl.h       |    26 +
 .../utilities/transactions/transaction_impl.cc     |   320 +
 .../utilities/transactions/transaction_impl.h      |   124 +
 .../utilities/transactions/transaction_lock_mgr.cc |   460 +
 .../utilities/transactions/transaction_lock_mgr.h  |    94 +
 .../utilities/transactions/transaction_test.cc     |  1902 ++
 .../utilities/transactions/transaction_util.cc     |   147 +
 .../utilities/transactions/transaction_util.h      |    60 +
 src/rocksdb/utilities/ttl/db_ttl_impl.cc           |     6 +-
 src/rocksdb/utilities/ttl/db_ttl_impl.h            |    16 +-
 src/rocksdb/utilities/ttl/ttl_test.cc              |    42 +-
 .../write_batch_with_index.cc                      |   264 +-
 .../write_batch_with_index_internal.cc             |    33 +-
 .../write_batch_with_index_internal.h              |     9 +-
 .../write_batch_with_index_test.cc                 |   636 +-
 src/test/Makefile-client.am                        |    61 +-
 src/test/Makefile-server.am                        |     6 +-
 src/test/Makefile.am                               |    12 +-
 src/test/ObjectMap/KeyValueDBMemory.cc             |     4 +
 src/test/ObjectMap/KeyValueDBMemory.h              |     2 +-
 src/test/ObjectMap/test_keyvaluedb_atomicity.cc    |     8 +-
 src/test/ObjectMap/test_keyvaluedb_iterators.cc    |    20 +-
 src/test/ObjectMap/test_object_map.cc              |     5 +-
 src/test/bench/bencher.cc                          |     3 +-
 src/test/bench/bencher.h                           |     2 +-
 src/test/bufferlist.cc                             |    64 +-
 src/test/centos-6/Dockerfile.in                    |     2 +-
 src/test/centos-6/ceph.spec.in                     |    55 +-
 src/test/centos-6/install-deps.sh                  |     5 +-
 src/test/centos-7/Dockerfile.in                    |     4 +-
 src/test/centos-7/ceph.spec.in                     |    55 +-
 src/test/centos-7/install-deps.sh                  |     5 +-
 src/test/ceph_objectstore_tool.py                  |   380 +-
 src/test/cli/crushtool/check-names.empty.t         |     3 +-
 src/test/cli/crushtool/check-names.max-id.t        |     1 +
 src/test/cli/crushtool/help.t                      |     2 +-
 src/test/cli/osdmaptool/pool.t                     |     2 +
 src/test/cli/radosgw-admin/help.t                  |     8 +-
 src/test/cli/rbd/help.t                            |  1230 +-
 src/test/cli/rbd/invalid-snap-usage.t              |    72 +-
 src/test/cli/rbd/not-enough-args.t                 |   128 +-
 src/test/cli/rbd/too-many-args.t                   |    33 +
 src/test/cls_journal/test_cls_journal.cc           |   380 +
 src/test/cls_rbd/test_cls_rbd.cc                   |   153 +-
 src/test/common/ObjectContents.h                   |     2 +-
 src/test/common/test_tableformatter.cc             |     2 +
 src/test/debian-jessie/Dockerfile.in               |     2 +-
 src/test/debian-jessie/install-deps.sh             |     5 +-
 src/test/encoding/readable.sh                      |   179 +-
 src/test/encoding/types.h                          |    20 +-
 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/erasure-code/test-erasure-code.sh         |     2 +-
 src/test/erasure-code/test-erasure-eio.sh          |     2 +-
 src/test/fedora-21/Dockerfile.in                   |     2 +-
 src/test/fedora-21/ceph.spec.in                    |    55 +-
 src/test/fedora-21/install-deps.sh                 |     5 +-
 src/test/journal/RadosTestFixture.cc               |    93 +
 src/test/journal/RadosTestFixture.h                |    62 +
 src/test/journal/test_Entry.cc                     |    96 +
 src/test/journal/test_FutureImpl.cc                |   206 +
 src/test/journal/test_JournalMetadata.cc           |   101 +
 src/test/journal/test_JournalPlayer.cc             |   395 +
 src/test/journal/test_JournalRecorder.cc           |   148 +
 src/test/journal/test_JournalTrimmer.cc            |   189 +
 src/test/journal/test_Journaler.cc                 |    84 +
 src/test/journal/test_ObjectPlayer.cc              |   275 +
 src/test/journal/test_ObjectRecorder.cc            |   329 +
 src/test/journal/test_main.cc                      |    26 +
 src/test/libcephfs/access.cc                       |   358 +
 src/test/libcephfs/flock.cc                        |     3 +-
 src/test/libcephfs/multiclient.cc                  |     8 +-
 src/test/libcephfs/test.cc                         |   147 +-
 src/test/librados/aio.cc                           |     8 +-
 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                          |   158 +-
 src/test/librados/tier.cc                          |   664 +-
 src/test/librados/watch_notify.cc                  |   102 +-
 src/test/librados_test_stub/LibradosTestStub.cc    |    53 +
 src/test/librados_test_stub/MockTestMemIoCtxImpl.h |   118 +
 .../librados_test_stub/MockTestMemRadosClient.h    |    44 +
 src/test/librados_test_stub/TestIoCtxImpl.cc       |    21 +
 src/test/librados_test_stub/TestIoCtxImpl.h        |    17 +
 src/test/librados_test_stub/TestMemIoCtxImpl.cc    |    17 +
 src/test/librados_test_stub/TestMemIoCtxImpl.h     |     2 +
 src/test/librados_test_stub/TestRadosClient.cc     |     4 +
 src/test/librados_test_stub/TestRadosClient.h      |     4 +-
 src/test/librados_test_stub/TestWatchNotify.cc     |    68 +-
 src/test/librados_test_stub/TestWatchNotify.h      |     4 +-
 src/test/libradosstriper/io.cc                     |     4 +-
 src/test/libradosstriper/rados-striper.sh          |     2 +-
 .../exclusive_lock/test_mock_AcquireRequest.cc     |   571 +
 .../exclusive_lock/test_mock_ReleaseRequest.cc     |   197 +
 src/test/librbd/fsx.cc                             |   140 +-
 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               |   537 +-
 src/test/librbd/test_JournalEntries.cc             |   214 +
 src/test/librbd/test_JournalReplay.cc              |   162 +
 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                   |   226 +-
 src/test/librbd/test_librbd.cc                     |   645 +-
 src/test/librbd/test_main.cc                       |     4 +
 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/mds/TestMDSAuthCaps.cc                    |   121 +-
 src/test/mon/misc.sh                               |    91 +-
 src/test/mon/mkfs.sh                               |     2 +-
 src/test/mon/mon-ping.sh                           |     2 +-
 src/test/mon/mon-scrub.sh                          |     2 +-
 src/test/mon/osd-crush.sh                          |    12 +-
 src/test/mon/osd-erasure-code-profile.sh           |     2 +-
 src/test/mon/osd-pool-create.sh                    |     2 +-
 src/test/msgr/test_msgr.cc                         |     4 +-
 src/test/multi_stress_watch.cc                     |     1 -
 src/test/objectstore/FileStoreTracker.h            |     2 +-
 src/test/objectstore/TestRocksdbOptionParse.cc     |     2 +-
 src/test/objectstore/test_idempotent.cc            |     5 +-
 src/test/objectstore/test_kv.cc                    |     2 +-
 src/test/objectstore_bench.cc                      |    35 +
 src/test/opensuse-13.2/Dockerfile.in               |     2 +-
 src/test/opensuse-13.2/ceph.spec.in                |    55 +-
 src/test/opensuse-13.2/install-deps.sh             |     5 +-
 src/test/osd/TestPGLog.cc                          |    34 +
 src/test/osd/osd-bench.sh                          |     2 +-
 src/test/osd/osd-config.sh                         |     2 +-
 src/test/osd/osd-copy-from.sh                      |     2 +-
 src/test/osd/osd-reactivate.sh                     |    55 +
 src/test/osd/osd-scrub-repair.sh                   |    44 +-
 src/test/osd/osd-scrub-snaps.sh                    |   227 +
 src/test/osd/types.cc                              |    59 +
 src/test/osdc/FakeWriteback.cc                     |     2 +-
 src/test/osdc/FakeWriteback.h                      |     3 +-
 src/test/osdc/object_cacher_stress.cc              |     4 +-
 src/test/pybind/test_ceph_argparse.py              |    13 +-
 src/test/python/ceph-disk/tests/test_ceph_disk.py  |   765 +-
 src/test/rgw/test_rgw_manifest.cc                  |     6 +-
 src/test/rgw/test_rgw_obj.cc                       |     2 +-
 src/test/run-rbd-unit-tests.sh                     |     2 +-
 src/test/test_filejournal.cc                       |    81 +-
 src/test/test_rgw_admin_log.cc                     |     4 +-
 src/test/test_rgw_admin_meta.cc                    |     4 +-
 src/test/test_rgw_admin_opstate.cc                 |     4 +-
 src/test/test_stress_watch.cc                      |     1 -
 src/test/test_subprocess.cc                        |    72 +-
 src/test/ubuntu-12.04/Dockerfile.in                |     2 +-
 src/test/ubuntu-12.04/install-deps.sh              |     5 +-
 src/test/ubuntu-14.04/Dockerfile.in                |     2 +-
 src/test/ubuntu-14.04/install-deps.sh              |     5 +-
 src/tools/Makefile-client.am                       |    59 +
 src/tools/Makefile.am                              |     6 +-
 src/tools/ceph-monstore-update-crush.sh            |    13 +-
 src/tools/ceph_kvstore_tool.cc                     |    13 +-
 src/tools/ceph_monstore_tool.cc                    |    53 +-
 src/tools/ceph_objectstore_tool.cc                 |   548 +-
 src/tools/ceph_osdomap_tool.cc                     |     8 +-
 src/tools/cephfs/DataScan.cc                       |   512 +-
 src/tools/cephfs/DataScan.h                        |    97 +-
 src/tools/cephfs/Dumper.cc                         |     7 +-
 src/tools/cephfs/TableTool.cc                      |   271 +-
 src/tools/cephfs/TableTool.h                       |    11 +-
 src/tools/rados/RadosImport.cc                     |     4 +-
 src/tools/rados/RadosImport.h                      |     2 +-
 src/tools/rados/rados.cc                           |   125 +-
 src/tools/rbd/ArgumentTypes.cc                     |   438 +
 src/tools/rbd/ArgumentTypes.h                      |   194 +
 src/tools/rbd/IndentStream.cc                      |    59 +
 src/tools/rbd/IndentStream.h                       |    60 +
 src/tools/rbd/OptionPrinter.cc                     |   107 +
 src/tools/rbd/OptionPrinter.h                      |    40 +
 src/tools/rbd/Shell.cc                             |   401 +
 src/tools/rbd/Shell.h                              |    76 +
 src/tools/rbd/Utils.cc                             |   608 +
 src/tools/rbd/Utils.h                              |   106 +
 src/tools/rbd/action/BenchWrite.cc                 |   310 +
 src/tools/rbd/action/Children.cc                   |    98 +
 src/tools/rbd/action/Clone.cc                      |    97 +
 src/tools/rbd/action/Copy.cc                       |    99 +
 src/tools/rbd/action/Create.cc                     |    93 +
 src/tools/rbd/action/Diff.cc                       |   140 +
 src/tools/rbd/action/DiskUsage.cc                  |   270 +
 src/tools/rbd/action/Export.cc                     |   196 +
 src/tools/rbd/action/ExportDiff.cc                 |   260 +
 src/tools/rbd/action/Feature.cc                    |   107 +
 src/tools/rbd/action/Flatten.cc                    |    71 +
 src/tools/rbd/action/ImageMeta.cc                  |   313 +
 src/tools/rbd/action/Import.cc                     |   320 +
 src/tools/rbd/action/ImportDiff.cc                 |   223 +
 src/tools/rbd/action/Info.cc                       |   240 +
 src/tools/rbd/action/Journal.cc                    |   969 +
 src/tools/rbd/action/Kernel.cc                     |   360 +
 src/tools/rbd/action/List.cc                       |   231 +
 src/tools/rbd/action/Lock.cc                       |   266 +
 src/tools/rbd/action/MergeDiff.cc                  |   441 +
 src/tools/rbd/action/MirrorPool.cc                 |   421 +
 src/tools/rbd/action/Nbd.cc                        |   186 +
 src/tools/rbd/action/ObjectMap.cc                  |    73 +
 src/tools/rbd/action/Remove.cc                     |    84 +
 src/tools/rbd/action/Rename.cc                     |    84 +
 src/tools/rbd/action/Resize.cc                     |    94 +
 src/tools/rbd/action/Snap.cc                       |   495 +
 src/tools/rbd/action/Status.cc                     |   133 +
 src/tools/rbd/action/Watch.cc                      |   137 +
 src/tools/rbd/rbd.cc                               |    20 +
 src/tools/rbd_nbd/rbd-nbd.cc                       |   739 +
 src/tools/scratchtool.c                            |     2 +-
 src/tracing/librados.tp                            |    99 +-
 src/tracing/librbd.tp                              |   148 +
 src/tracing/osd.tp                                 |    28 +-
 src/tracing/tracing-common.h                       |     2 +-
 src/vstart.sh                                      |    24 +-
 systemd/Makefile.am                                |     7 +-
 systemd/Makefile.in                                |    10 +-
 systemd/ceph                                       |     4 +-
 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 +-
 systemd/rbdmap.service                             |    12 +
 1449 files changed, 178387 insertions(+), 52417 deletions(-)

diff --cc debian/changelog
index 7a1136d,19d8ad6..d32e654
--- a/debian/changelog
+++ b/debian/changelog
@@@ -52,8 -21,13 +60,13 @@@ ceph (9.2.0-0ubuntu1) xenial; urgency=m
    * [4c45629] Update NEWS file for infernalis changes.
    * [940491e] Limit number of parallel builds to 2 to reduce memory footprint
                on builders.
+   * [23e78f3] d/ceph-mds.postinst: Fix syntax error.
+   * [26182b5] d/ceph-mds.dirs: Actually create /var/lib/ceph/mds prior
+               to changing permissions (LP: #1544647).
+   * [414f4c1] d/ceph.init: Restore link to init-ceph, resolving un-install
+               failures due to missing init script (LP: #1546112).
  
 - -- James Page <james.page at ubuntu.com>  Mon, 09 Nov 2015 12:38:52 +0000
 + -- James Page <james.page at ubuntu.com>  Wed, 09 Dec 2015 18:02:30 +0000
  
  ceph (0.94.5-1) experimental; urgency=medium
  

-- 
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