Merge remote-tracking branch 'gh/jewel'

diff --cc ceph.spec.in
index cf5f220c5b48181aec5eb5688aab66c857e5684e,a8f89186b328b943408180c8c3f441cc506bfdc8..640f1aef764334729dd1fd97f4ec5f363de2bcfb
--- 1/ceph.spec.in
--- 2/ceph.spec.in
+++ b/ceph.spec.in
@@@ -240,6 -217,37 +219,38 @@@ on commodity hardware and delivers obje
  #################################################################################
  # packages
  #################################################################################
+ %package base
+ Summary:       Ceph Base Package
+ Group:         System Environment/Base
+ Requires:      ceph-common = %{epoch}:%{version}-%{release}
+ Requires:      librbd1 = %{epoch}:%{version}-%{release}
+ Requires:      librados2 = %{epoch}:%{version}-%{release}
+ Requires:      libcephfs1 = %{epoch}:%{version}-%{release}
++Requires:      librgw2 = %{epoch}:%{version}-%{release}
+ %if 0%{with selinux}
+ Requires:      ceph-selinux = %{epoch}:%{version}-%{release}
+ %endif
+ Requires:      python
+ Requires:      python-requests
+ Requires:      python-setuptools
+ Requires:      grep
+ Requires:      xfsprogs
+ Requires:      logrotate
+ Requires:      parted
+ Requires:      util-linux
+ Requires:      hdparm
+ Requires:      cryptsetup
+ Requires:      findutils
+ Requires:      which
+ %if 0%{?suse_version}
+ Requires:      lsb-release
+ %endif
+ %if 0%{?fedora} || 0%{?rhel}
+ Requires:      redhat-lsb-core
+ %endif
+ %description base
+ Base is the package that includes all the files shared amongst ceph servers
+ 
  %package -n ceph-common
  Summary:      Ceph Common
  Group:                System Environment/Base
@@@ -305,9 -340,14 +343,15 @@@ Requires:        ceph-common = %{epoch}:%{vers
  Requires:     ceph-selinux = %{epoch}:%{version}-%{release}
  %endif
  Requires:     librados2 = %{epoch}:%{version}-%{release}
 +Requires:     librgw2 = %{epoch}:%{version}-%{release}
  %if 0%{?rhel} || 0%{?fedora}
  Requires:     mailcap
+ # python-flask for powerdns
+ Requires:     python-flask
+ %endif
+ %if 0%{?suse_version}
+ # python-Flask for powerdns
+ Requires:      python-Flask
  %endif
  %description radosgw
  This package is an S3 HTTP REST gateway for the RADOS object store. It
@@@ -1283,9 -1308,9 +1351,10 @@@ ln -sf %{_libdir}/librbd.so.1 /usr/lib6
  %{_bindir}/ceph_smalliobenchfs
  %{_bindir}/ceph_smalliobenchrbd
  %{_bindir}/ceph_test_*
 +%{_bindir}/librgw_file*
  %{_bindir}/ceph_tpbench
  %{_bindir}/ceph_xattr_bench
+ %{_bindir}/ceph-coverage
  %{_bindir}/ceph-monstore-tool
  %{_bindir}/ceph-osdomap-tool
  %{_bindir}/ceph-kvstore-tool

diff --cc configure.ac
Simple merge

diff --cc debian/control
index c30d5766f8b6994a99a3edcd2e833f5c66397a03,1d37d916cc9151e0fd5bcc7dcb292140c4ae4c66..10671829ebfece3b84711fca05eaf01c12a6076a
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -488,48 -541,13 +543,52 @@@ Description: Ceph distributed file syst
   This package contains development files needed for building applications that
   link against libcephfs.
  
 +Package: librgw2
 +Architecture: linux-any
 +Section: libs
 +Depends: librados2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 +Description: RADOS Gateway client library
 + RADOS is a distributed object store used by the Ceph distributed
 + storage system.  This package provides a REST gateway to the
 + object store that aims to implement a superset of Amazon's S3
 + service.
 + .
 + This package contains the library interface and headers only.
 +
 +Package: librgw2-dbg
 +Architecture: linux-any
 +Section: debug
 +Priority: extra
 +Depends: librgw2 (= ${binary:Version}), ${misc:Depends}
 +Description: debugging symbols for librbd1
 + RADOS is a distributed object store used by the Ceph distributed
 + storage system.  This package provides a REST gateway to the
 + object store that aims to implement a superset of Amazon's S3
 + service.
 + .
 + This package contains debugging symbols for librgw2.
 +
 +Package: librgw-dev
 +Architecture: linux-any
 +Section: libdevel
 +Depends: librados-dev, librgw2 (= ${binary:Version}), ${misc:Depends}
 +Description: RADOS client library (development files)
 + RADOS is a distributed object store used by the Ceph distributed
 + storage system.  This package provides a REST gateway to the
 + object store that aims to implement a superset of Amazon's S3
 + service.
 + .
 + This package contains development files needed for building applications
 + that link against librgw2.
 +
  Package: radosgw
  Architecture: linux-any
- Depends: librgw2, ceph-common (= ${binary:Version}), mime-support,
-          ${misc:Depends}, ${shlibs:Depends}
+ Depends: ceph-common (= ${binary:Version}),
+          mime-support,
+          python-flask,
++       librgw2,
+          ${misc:Depends},
+          ${shlibs:Depends}
  Description: REST gateway for RADOS distributed object store
   RADOS is a distributed object store used by the Ceph distributed
   storage system.  This package provides a REST gateway to the

diff --cc debian/rules
Simple merge

diff --cc src/init-ceph.in
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/PG.cc
Simple merge

diff --cc src/osd/PG.h
Simple merge