[Pkg-ceph-commits] [ceph] 02/03: Merge branch 'master' into wheezy-backports

[Dmitry Smirnov]

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

onlyjob pushed a commit to branch wheezy-backports
in repository ceph.

commit 32f15d1
Merge: 6d5b611 07e84d4
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Wed Jul 23 18:13:38 2014

    Merge branch 'master' into wheezy-backports

 ceph.spec                                 | 179 +++++++++------
 ceph.spec.in                              | 177 +++++++++------
 configure                                 |  28 +--
 configure.ac                              |   4 +-
 debian/changelog                          |  22 ++
 debian/patches/backfill-prio.patch        | 268 +++++++++++++++++++++++
 debian/patches/bash-completion.patch      | 105 +++++++++
 debian/patches/bug-8342.patch             |  38 ++++
 debian/patches/bug-8624a.patch            |  64 ++++++
 debian/patches/bug-8624b.patch            |  41 ++++
 debian/patches/bug-8821.patch             | 353 ++++++++++++++++++++++++++++++
 debian/patches/ceph-ao-require-cas.patch  |  16 ++
 debian/patches/firefly-post-release.patch |  49 +++++
 debian/patches/gcj.patch                  |  56 -----
 debian/patches/gcj_search_path.patch      |  22 --
 debian/patches/rbdmap1-mount.patch        | 154 +++++++++++++
 debian/patches/rbdmap2-hooks.patch        | 103 +++++++++
 debian/patches/rbdmap3-lazyumount.patch   |  56 +++++
 debian/patches/sample.ceph.conf.patch     |  60 +++--
 debian/patches/series                     |  13 +-
 debian/radosgw.lintian-overrides          |   3 -
 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/common/config_opts.h                  |   6 +
 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             |  27 ++-
 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                      | 103 ++++++---
 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 +
 74 files changed, 2564 insertions(+), 560 deletions(-)

diff --cc debian/changelog
index f2595ce,e938c89..1580c40
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,25 +1,31 @@@
+ ceph (0.80.4-1) unstable; urgency=medium
+ 
+   * New upstream release [July 2014].
+   * New patches:
+     + rbdmap1-mount.patch
+     + rbdmap2-hooks.patch
+     + rbdmap3-lazyumount.patch
+     + bug-8821.patch
+   * radosgw: removed unused lintian overrides.
+ 
+  -- Dmitry Smirnov <onlyjob at debian.org>  Fri, 18 Jul 2014 02:33:39 +1000
+ 
+ ceph (0.80.1-2) unstable; urgency=low
+ 
+   * Megapatch from "firefly" branch with post-0.80.1 fixes.
+   * Patches for upstream bugs 8342, 8624 and some cherry-picks.
+   * New "bash-completion.patch" with Bash completion improvements.
+   * New patch to fix FTBFS on 'hppa' (Closes: #748571).
+   * "sample.ceph.conf.patch": minor update.
+ 
+  -- Dmitry Smirnov <onlyjob at debian.org>  Sat, 05 Jul 2014 20:29:44 +1000
+ 
 +ceph (0.80.1-1~bpo70+1) wheezy-backports; urgency=low
 +
 +  * Rebuild for wheezy-backports.
 +
 + -- Thomas Goirand <zigo at debian.org>  Wed, 14 May 2014 15:40:00 +0000
 +
  ceph (0.80.1-1) unstable; urgency=low
  
    * New upstream release [May 2014].

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