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

[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 298aa85862fdd09dc69866715fec037e0b829672
Merge: 34f4a18 9cdacf5
Author: James Page <james.page at ubuntu.com>
Date:   Tue Dec 31 14:37:29 2013 +0000

    Merge tag 'upstream/0.72.2'
    
    Upstream version 0.72.2

 ceph.spec                             |  2 +-
 configure                             | 22 +++++++-------
 configure.ac                          |  2 +-
 src/.git_version                      |  4 +--
 src/ceph_common.sh                    |  4 +++
 src/common/hobject.h                  |  5 ++++
 src/mon/MonCommands.h                 |  2 +-
 src/mon/OSDMonitor.cc                 | 27 +++++++++---------
 src/osd/OSD.cc                        |  2 +-
 src/osd/ReplicatedPG.cc               |  7 +++--
 src/rgw/rgw_acl_s3.cc                 |  6 ++--
 src/rgw/rgw_rados.cc                  | 54 +++++++++++++++++++++++++++++------
 src/rgw/rgw_rados.h                   |  2 ++
 src/upstart/ceph-mds-all-starter.conf |  2 +-
 src/upstart/ceph-mon-all-starter.conf |  2 +-
 src/upstart/ceph-osd-all-starter.conf |  2 +-
 16 files changed, 98 insertions(+), 47 deletions(-)

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-ceph/ceph.git