[Pkg-ceph-commits] [ceph] 02/02: Merge tag 'upstream/0.80.6'

Dmitry Smirnov onlyjob at moszumanska.debian.org
Thu Oct 2 12:58:51 UTC 2014


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

onlyjob pushed a commit to branch master
in repository ceph.

commit 7f64dee (HEAD, master)
Merge: ab4d8de 680e2ae
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Thu Oct 2 12:57:30 2014

    Merge tag 'upstream/0.80.6'
    
    Upstream version 0.80.6

 ceph.spec                                        |   2 +-
 configure                                        | 240 ++++++++-
 configure.ac                                     |   9 +-
 src/.git_version                                 |   4 +-
 src/Makefile.in                                  |  86 ++--
 src/acconfig.h.in                                |   3 +
 src/ceph-disk                                    | 376 +++++++++++----
 src/ceph.in                                      |  35 +-
 src/ceph_common.sh                               |   5 +-
 src/ceph_mon.cc                                  |  22 +-
 src/ceph_osd.cc                                  |  20 +
 src/cls/rgw/cls_rgw.cc                           |   2 +-
 src/common/Finisher.h                            |   9 +
 src/common/LogClient.cc                          |   3 +-
 src/common/Makefile.am                           |   3 +
 src/common/Thread.cc                             |  34 +-
 src/common/Thread.h                              |   5 +
 src/common/WorkQueue.cc                          |  21 +
 src/common/WorkQueue.h                           |   4 +
 src/common/blkdev.cc                             |   2 +-
 src/common/config.cc                             |  10 +-
 src/common/config_opts.h                         |  12 +
 src/common/io_priority.cc                        |  54 +++
 src/common/io_priority.h                         |  44 ++
 src/common/random_cache.hpp                      | 111 +++++
 src/common/str_map.cc                            |   2 +-
 src/common/strtol.cc                             |  43 ++
 src/common/strtol.h                              |   5 +
 src/crush/CrushWrapper.cc                        | 109 ++++-
 src/crush/CrushWrapper.h                         |  14 +
 src/erasure-code/ErasureCodeInterface.h          |   2 +-
 src/erasure-code/ErasureCodePlugin.cc            |  28 ++
 src/erasure-code/ErasureCodePlugin.h             |   3 +
 src/erasure-code/jerasure/ErasureCodeJerasure.cc |   8 +-
 src/global/global_init.cc                        |  10 +-
 src/include/atomic.h                             | 123 +++--
 src/include/intarith.h                           |   2 +-
 src/include/rbd/librbd.h                         |   9 +
 src/include/rbd/librbd.hpp                       |   8 +
 src/include/str_map.h                            |   2 +-
 src/init-ceph.in                                 |  33 +-
 src/init-radosgw.sysv                            |  13 +-
 src/librados/RadosClient.cc                      |   8 +-
 src/librbd/ImageCtx.cc                           |  20 +-
 src/librbd/ImageCtx.h                            |   2 +-
 src/librbd/internal.cc                           |  42 +-
 src/librbd/internal.h                            |   2 +
 src/librbd/librbd.cc                             |  12 +
 src/mds/Locker.cc                                |   8 +-
 src/mds/MDCache.cc                               |   2 +
 src/messages/MOSDSubOp.h                         |  10 +-
 src/mon/DataHealthService.cc                     |   2 +-
 src/mon/MonCommands.h                            |   6 +-
 src/mon/Monitor.cc                               |  41 +-
 src/mon/Monitor.h                                |   3 +
 src/mon/MonmapMonitor.cc                         |   5 +
 src/mon/OSDMonitor.cc                            | 276 ++++++++++-
 src/mon/OSDMonitor.h                             |   2 +-
 src/mon/PGMonitor.cc                             |  83 +++-
 src/mon/PGMonitor.h                              |   6 +-
 src/mon/Paxos.cc                                 |   3 +-
 src/msg/SimpleMessenger.cc                       |   3 +
 src/os/FileJournal.cc                            |   7 +-
 src/os/FileStore.cc                              |  15 +-
 src/os/FileStore.h                               |  72 ++-
 src/os/GenericObjectMap.cc                       |  46 +-
 src/os/GenericObjectMap.h                        |  37 +-
 src/os/KeyValueStore.cc                          | 587 ++++++++++++-----------
 src/os/KeyValueStore.h                           | 182 ++++---
 src/os/LFNIndex.cc                               |  88 +++-
 src/os/LFNIndex.h                                |   8 +-
 src/os/MemStore.cc                               |   7 +-
 src/os/ObjectStore.cc                            |   6 +-
 src/os/ObjectStore.h                             |  26 +
 src/osd/ECBackend.cc                             |  10 +-
 src/osd/ECBackend.h                              |   2 +
 src/osd/ECMsgTypes.cc                            |  28 +-
 src/osd/ECMsgTypes.h                             |   5 +-
 src/osd/HitSet.h                                 |   2 +-
 src/osd/OSD.cc                                   | 168 +++++--
 src/osd/OSD.h                                    |  58 ++-
 src/osd/OSDMap.cc                                |  49 +-
 src/osd/OSDMap.h                                 |   3 +
 src/osd/OpRequest.cc                             |   2 +-
 src/osd/OpRequest.h                              |   4 +
 src/osd/PG.cc                                    | 275 +++++++++--
 src/osd/PG.h                                     | 125 ++++-
 src/osd/PGBackend.cc                             |  11 +-
 src/osd/PGBackend.h                              |   5 +-
 src/osd/PGLog.cc                                 |  42 +-
 src/osd/PGLog.h                                  |  71 ++-
 src/osd/ReplicatedBackend.cc                     |  10 +-
 src/osd/ReplicatedBackend.h                      |   2 +
 src/osd/ReplicatedPG.cc                          | 176 ++++---
 src/osd/ReplicatedPG.h                           |   3 +-
 src/osd/osd_types.cc                             |  22 +-
 src/osd/osd_types.h                              | 121 ++++-
 src/osdc/Objecter.cc                             |  12 +-
 src/osdc/Objecter.h                              |   2 +-
 src/pybind/rados.py                              |   7 +-
 src/pybind/rbd.py                                |   8 +
 src/rgw/rgw_common.cc                            |  10 +-
 src/rgw/rgw_op.cc                                |  72 +--
 src/rgw/rgw_rados.cc                             | 174 +++++--
 src/rgw/rgw_rados.h                              |  20 +-
 src/rgw/rgw_rest.cc                              |   4 +-
 src/rgw/rgw_rest_swift.cc                        |   6 +-
 src/test/crush/TestCrushWrapper.cc               |   5 +
 src/test/erasure-code/TestErasureCodeJerasure.cc |  30 ++
 src/test/librados/TestCase.cc                    |  32 +-
 src/test/librados/TestCase.h                     |   7 +-
 src/test/librados/io.cc                          |  52 ++
 src/test/librados/tier.cc                        | 538 +++++++--------------
 src/test/objectstore/store_test.cc               | 105 ++++
 src/test/osd/TestOSDMap.cc                       |  57 ++-
 src/test/osd/osd-test-helpers.sh                 |   1 +
 src/test/strtol.cc                               |  75 +++
 117 files changed, 4097 insertions(+), 1461 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