[Pkg-ceph-commits] [ceph] 01/04: Merge tag 'upstream/0.80.4'

[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 26c2522
Merge: a989c75 c269308
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Thu Jul 17 09:52:17 2014

    Merge tag 'upstream/0.80.4'
    
    Upstream version 0.80.4

 ceph.spec                     |  2 +-
 configure                     | 22 +++++++++++-----------
 configure.ac                  |  2 +-
 src/.git_version              |  4 ++--
 src/common/config_opts.h      |  6 ++++++
 src/os/XfsFileStoreBackend.cc | 19 ++++++++++++-------
 src/rgw/rgw_rados.cc          |  3 ++-
 7 files changed, 35 insertions(+), 23 deletions(-)

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