[Pkg-ceph-commits] [ceph] 03/05: Merge tag 'upstream/10.1.2' into ubuntu-xenial
James Downing Page
jamespage at moszumanska.debian.org
Thu Apr 14 09:10:53 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 e5fcfc7cba1f8a276fc1bf48fc1bffd2ca5c0b62
Merge: 1d4cd80 e35cc17
Author: James Page <james.page at ubuntu.com>
Date: Thu Apr 14 10:04:57 2016 +0100
Merge tag 'upstream/10.1.2' into ubuntu-xenial
Upstream version 10.1.2
AUTHORS | 7 +-
ChangeLog | 124 +++++++++++-
ceph.spec | 2 +-
configure | 20 +-
configure.ac | 2 +-
doc/man/8/ceph-authtool.rst | 40 +++-
doc/man/8/radosgw-admin.rst | 2 +-
man/ceph-authtool.8 | 46 ++++-
man/ceph-clsinfo.8 | 2 +-
man/ceph-conf.8 | 2 +-
man/ceph-create-keys.8 | 2 +-
man/ceph-debugpack.8 | 2 +-
man/ceph-dencoder.8 | 2 +-
man/ceph-deploy.8 | 2 +-
man/ceph-detect-init.8 | 2 +-
man/ceph-disk.8 | 2 +-
man/ceph-fuse.8 | 2 +-
man/ceph-mds.8 | 2 +-
man/ceph-mon.8 | 2 +-
man/ceph-osd.8 | 2 +-
man/ceph-post-file.8 | 2 +-
man/ceph-rbdnamer.8 | 2 +-
man/ceph-rest-api.8 | 2 +-
man/ceph-run.8 | 2 +-
man/ceph-syn.8 | 2 +-
man/ceph.8 | 2 +-
man/cephfs.8 | 2 +-
man/crushtool.8 | 2 +-
man/librados-config.8 | 2 +-
man/monmaptool.8 | 2 +-
man/mount.ceph.8 | 2 +-
man/osdmaptool.8 | 2 +-
man/rados.8 | 2 +-
man/radosgw-admin.8 | 4 +-
man/radosgw.8 | 2 +-
man/rbd-fuse.8 | 2 +-
man/rbd-mirror.8 | 2 +-
man/rbd-nbd.8 | 2 +-
man/rbd-replay-many.8 | 2 +-
man/rbd-replay-prep.8 | 2 +-
man/rbd-replay.8 | 2 +-
man/rbd.8 | 2 +-
man/rbdmap.8 | 2 +-
src/.git_version | 4 +-
src/Makefile-env.am | 4 +-
src/Makefile.in | 8 +-
src/ceph-disk/ceph_disk/main.py | 18 +-
src/ceph_fuse.cc | 7 +
src/ceph_osd.cc | 3 +-
src/client/Client.cc | 22 ++-
src/client/Client.h | 2 +-
src/cls/rgw/cls_rgw_ops.h | 6 +-
src/common/Thread.cc | 5 +-
src/common/buffer.cc | 10 +-
src/common/ceph_time.h | 7 +-
src/common/config_opts.h | 14 ++
src/common/fs_types.cc | 16 +-
src/crush/CrushWrapper.cc | 2 +-
src/include/ceph_fs.h | 5 +
src/include/fs_types.h | 2 +
src/include/rados.h | 5 -
src/journal/FutureImpl.cc | 14 +-
src/journal/FutureImpl.h | 6 +-
src/journal/JournalRecorder.cc | 3 +-
src/journal/JournalTrimmer.cc | 3 +-
src/journal/ObjectPlayer.cc | 15 +-
src/librados/IoCtxImpl.cc | 109 +++++++----
src/librbd/ImageCtx.cc | 2 +-
src/librbd/Journal.cc | 10 +-
src/librbd/internal.cc | 16 +-
src/logrotate.conf | 2 +-
src/mds/Beacon.cc | 7 +
src/mds/CInode.cc | 47 ++---
src/mds/CInode.h | 9 +
src/mds/FSMap.cc | 50 ++++-
src/mds/FSMap.h | 9 +-
src/mds/Locker.cc | 1 +
src/mds/MDBalancer.cc | 2 +
src/mds/MDCache.cc | 5 +
src/mds/MDSDaemon.cc | 26 ++-
src/mds/MDSMap.cc | 32 +++-
src/mds/MDSMap.h | 30 ++-
src/mds/MDSRank.cc | 48 +++--
src/mds/events/ESessions.h | 2 +-
src/mds/journal.cc | 19 ++
src/messages/MMDSBeacon.h | 3 +-
src/mon/MDSMonitor.cc | 101 +++++++++-
src/mon/MonCommands.h | 11 +-
src/mon/OSDMonitor.cc | 13 +-
src/os/ObjectStore.cc | 11 +-
src/os/ObjectStore.h | 16 +-
src/os/bluestore/BlueFS.cc | 244 +++++++++++++++++-------
src/os/bluestore/BlueFS.h | 59 ++++--
src/os/bluestore/BlueStore.cc | 63 ++++---
src/os/bluestore/BlueStore.h | 4 +-
src/os/filestore/FileStore.cc | 53 +++++-
src/os/filestore/FileStore.h | 8 +-
src/os/filestore/IndexManager.cc | 5 +-
src/os/filestore/LFNIndex.cc | 211 +++++++++++----------
src/os/filestore/LFNIndex.h | 25 ++-
src/os/filestore/chain_xattr.cc | 110 ++++-------
src/os/filestore/chain_xattr.h | 99 +++++++++-
src/os/kstore/KStore.h | 5 +-
src/os/memstore/MemStore.h | 4 +-
src/osd/OSD.cc | 24 +--
src/osd/OSD.h | 8 +-
src/osd/PG.cc | 19 +-
src/osd/ReplicatedPG.cc | 70 +++++--
src/osdc/Objecter.cc | 26 +--
src/osdc/Objecter.h | 290 ++++++++++++++++++++---------
src/pybind/ceph_rest_api.py | 9 -
src/rgw/librgw.cc | 15 +-
src/rgw/rgw_admin.cc | 17 +-
src/rgw/rgw_common.h | 1 +
src/rgw/rgw_ldap.h | 2 +
src/rgw/rgw_op.cc | 6 +-
src/rgw/rgw_op.h | 2 +
src/rgw/rgw_rest.cc | 5 +
src/rgw/rgw_rest_conn.cc | 2 +-
src/rgw/rgw_rest_s3.cc | 18 +-
src/rgw/rgw_sync.cc | 25 ++-
src/test/cli/ceph-authtool/help.t | 11 +-
src/test/cli/ceph-authtool/manpage.t | 11 +-
src/test/cli/ceph-authtool/simple.t | 11 +-
src/test/encoding/check-generated.sh | 2 +-
src/test/encoding/types.h | 4 +
src/test/journal/test_FutureImpl.cc | 43 +++--
src/test/journal/test_ObjectRecorder.cc | 55 ++----
src/test/librados/misc.cc | 108 ++++++++++-
src/test/librbd/test_mock_Journal.cc | 3 +
src/test/librgw_file_nfsns.cc | 15 ++
src/test/objectstore/chain_xattr.cc | 114 ++++++++++++
src/test/objectstore/test_bluefs.cc | 20 +-
src/test/os/TestLFNIndex.cc | 2 +-
src/test/pybind/test_ceph_argparse.py | 5 +
src/test/rbd_mirror/test_ClusterWatcher.cc | 6 +-
src/test/rbd_mirror/test_ImageReplayer.cc | 11 +-
src/test/rbd_mirror/test_ImageSync.cc | 5 +
src/test/rbd_mirror/test_PoolWatcher.cc | 6 +-
src/test/rbd_mirror/test_fixture.cc | 6 +-
src/tools/Makefile-client.am | 1 +
src/tools/ceph_authtool.cc | 15 +-
src/tools/rbd/action/Journal.cc | 42 ++---
src/tools/rbd_mirror/Replayer.cc | 56 ++++--
src/vstart.sh | 2 +-
systemd/ceph-mds at .service | 1 +
systemd/ceph-mon at .service | 1 +
systemd/ceph-osd at .service | 1 +
systemd/ceph-radosgw at .service | 1 +
systemd/ceph-rbd-mirror at .service | 1 +
150 files changed, 2165 insertions(+), 900 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git
More information about the Pkg-ceph-commits
mailing list