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

[Dmitry Smirnov]

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

onlyjob pushed a commit to branch master
in repository ceph.

commit a989c75 (HEAD, master)
Merge: 31e3ba5 09c4b18
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Mon Jul 14 18:11:41 2014

    Merge tag 'upstream/0.80.3'
    
    Upstream version 0.80.3

 ceph.spec                              | 179 ++++++++++++++++---------
 ceph.spec.in                           | 177 +++++++++++++++---------
 configure                              |  28 ++--
 configure.ac                           |   4 +-
 m4/ac_prog_javac.m4                    |   4 +-
 src/.git_version                       |   4 +-
 src/brag/client/ceph-brag              | 205 ++++++++++++++++++++++++++--
 src/ceph-disk                          |  14 +-
 src/ceph_common.sh                     |  18 +++
 src/crush/CrushWrapper.cc              |  12 ++
 src/crush/CrushWrapper.h               |  32 ++++-
 src/include/ceph_features.h            |   2 +
 src/init-ceph.in                       |   8 +-
 src/java/Makefile.am                   |   4 +-
 src/java/Makefile.in                   |   4 +-
 src/java/native/libcephfs_jni.cc       |   2 +-
 src/librados/librados.cc               |   6 +-
 src/messages/MForward.h                |   2 +-
 src/mon/ConfigKeyService.h             |   8 +-
 src/mon/DataHealthService.cc           |  25 ++--
 src/mon/DataHealthService.h            |   3 +-
 src/mon/HealthMonitor.cc               |  12 +-
 src/mon/HealthMonitor.h                |   5 +-
 src/mon/HealthService.h                |   5 +-
 src/mon/MonCommands.h                  |   8 +-
 src/mon/Monitor.cc                     |   6 +-
 src/mon/OSDMonitor.cc                  | 120 +++++++++++------
 src/mon/OSDMonitor.h                   |  11 +-
 src/mon/QuorumService.h                |   3 +-
 src/msg/Pipe.cc                        |  14 +-
 src/os/FileStore.cc                    |  20 +++
 src/os/HashIndex.cc                    |   6 +-
 src/os/XfsFileStoreBackend.cc          |   8 ++
 src/osd/OSD.cc                         |  72 ++++++----
 src/osd/OSDMap.cc                      |  30 +++--
 src/osd/OSDMap.h                       |   3 +-
 src/osd/PG.cc                          |  30 ++++-
 src/osd/PG.h                           |   7 +
 src/osd/ReplicatedPG.cc                |  40 +++++-
 src/osd/ReplicatedPG.h                 |   2 +
 src/osd/osd_types.cc                   |  20 ++-
 src/osd/osd_types.h                    |   7 +-
 src/osdc/ObjectCacher.cc               |   3 +
 src/osdc/Objecter.cc                   |  21 ++-
 src/pybind/ceph_rest_api.py            |   2 +-
 src/rgw/rgw_json_enc.cc                |   1 +
 src/rgw/rgw_op.cc                      | 237 +++++++++++++++++++++++++++------
 src/rgw/rgw_op.h                       |  28 ++--
 src/rgw/rgw_rados.cc                   | 100 +++++++++-----
 src/rgw/rgw_rados.h                    |  35 ++---
 src/test/cli/osdmaptool/clobber.t      |  12 +-
 src/test/cli/osdmaptool/create-print.t |  20 +--
 src/test/cli/osdmaptool/create-racks.t |  20 +--
 src/test/librados/pool.cc              |  12 +-
 src/test/librados/tier.cc              |   3 +
 src/tools/rados/rados.cc               |   9 ++
 56 files changed, 1218 insertions(+), 455 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git