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

[James Downing Page]

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

jamespage pushed a commit to branch master
in repository ceph.

commit 9648e641f921ae6a3d15daea692b6ac6ffd04210
Merge: 07e84d4 9a6f21f
Author: James Page <james.page at ubuntu.com>
Date:   Wed Jul 30 08:58:27 2014 +0100

    Merge tag 'upstream/0.80.5'
    
    Upstream version 0.80.5

 ceph.spec                                 |   10 +-
 ceph.spec.in                              |    8 +-
 configure                                 |   36 +-
 configure.ac                              |    6 +-
 src/.git_version                          |    4 +-
 src/Makefile-env.am                       |    3 +
 src/Makefile.in                           | 1188 ++++++++++++++++++++---------
 src/acconfig.h.in                         |    6 -
 src/ceph-disk                             |    2 +-
 src/common/utf8.c                         |    4 +-
 src/common/utf8.h                         |   12 +
 src/init-ceph.in                          |   10 +-
 src/logrotate.conf                        |    2 +-
 src/mon/AuthMonitor.cc                    |   27 +-
 src/mon/Makefile.am                       |    7 +-
 src/os/Makefile.am                        |    7 +
 src/os/ObjectStore.cc                     |  466 -----------
 src/os/{ObjectStore.cc => Transaction.cc} |  152 +---
 src/osd/ECBackend.cc                      |    3 +-
 src/osd/ECBackend.h                       |    2 +-
 src/osd/Makefile.am                       |   13 +-
 src/osd/OSD.cc                            |   17 +-
 src/osd/OSD.h                             |    1 +
 src/osd/PGBackend.cc                      |    3 +-
 src/osd/PGBackend.h                       |    8 +-
 src/osd/ReplicatedBackend.cc              |    3 +-
 src/osd/ReplicatedBackend.h               |    2 +-
 src/osd/ReplicatedPG.cc                   |    8 +-
 src/rgw/Makefile.am                       |    3 +-
 src/rgw/rgw_acl.cc                        |    5 -
 src/rgw/rgw_acl_s3.cc                     |   10 -
 src/rgw/rgw_acl_s3.h                      |    1 +
 src/rgw/rgw_admin.cc                      |    2 +-
 src/rgw/rgw_bucket.cc                     |    6 +-
 src/rgw/rgw_dencoder.cc                   |  168 ++++
 src/rgw/rgw_op.cc                         |    8 +-
 src/rgw/rgw_op.h                          |    1 +
 src/rgw/rgw_rados.cc                      |  234 ++----
 src/rgw/rgw_rados.h                       |    5 +-
 src/rgw/rgw_rest_s3.cc                    |    5 +-
 src/test/Makefile.am                      |   11 +-
 41 files changed, 1199 insertions(+), 1270 deletions(-)

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