[Pkg-ceph-commits] [ceph] 46/59: d/p/32bit-compat-service-daemon.patch: Dropped, accepted upstream.

[James Downing Page]

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

jamespage pushed a commit to branch ubuntu/artful
in repository ceph.

commit f1b96466ac065bee1cbd51fd43e1042a58881b9d
Author: James Page <james.page at ubuntu.com>
Date:   Tue Aug 29 08:35:27 2017 +0000

    d/p/32bit-compat-service-daemon.patch: Dropped, accepted upstream.
---
 debian/changelog                                 |  1 +
 debian/patches/32bit-compat-service-daemon.patch | 33 ------------------------
 debian/patches/series                            |  1 -
 3 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6f26f54..5657334 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ceph (12.1.4-0ubuntu1) UNRELEASED; urgency=medium
 
   * New release candidate for next stable release.
+  * d/p/32bit-compat-service-daemon.patch: Dropped, accepted upstream.
 
  -- James Page <ubuntu at juju-ffbf2b-builders-1.openstacklocal>  Tue, 29 Aug 2017 08:28:30 +0000
 
diff --git a/debian/patches/32bit-compat-service-daemon.patch b/debian/patches/32bit-compat-service-daemon.patch
deleted file mode 100644
index a883af3..0000000
--- a/debian/patches/32bit-compat-service-daemon.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Resolve build failures on 32bit archs
- size_t is an unsigned 32bit integer on 32bit archs which
- does not unambiguously convert to a uint64_t or bool as
- detailed in the service_daemon Attribute type.
-Author: James Page <james.page at ubuntu.com>
-Forwareded: no
-
---- a/src/tools/rbd_mirror/InstanceReplayer.cc
-+++ b/src/tools/rbd_mirror/InstanceReplayer.cc
-@@ -372,9 +372,9 @@ void InstanceReplayer<I>::start_image_re
-     return;
-   }
- 
--  size_t image_count = 0;
--  size_t warning_count = 0;
--  size_t error_count = 0;
-+  uint64_t image_count = 0;
-+  uint64_t warning_count = 0;
-+  uint64_t error_count = 0;
-   for (auto &it : m_image_replayers) {
-     ++image_count;
-     auto health_state = it.second->get_health_state();
---- a/src/tools/rbd_mirror/PoolWatcher.h
-+++ b/src/tools/rbd_mirror/PoolWatcher.h
-@@ -52,7 +52,7 @@ public:
-   void init(Context *on_finish = nullptr);
-   void shut_down(Context *on_finish);
- 
--  inline size_t get_image_count() const {
-+  inline uint64_t get_image_count() const {
-     Mutex::Locker locker(m_lock);
-     return m_image_ids.size();
-   }
diff --git a/debian/patches/series b/debian/patches/series
index 3aa855a..76f80f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@
 0003-Core-local-statistics.patch
 # Ubuntu: rocksdb/i386/gcc-7 compat
 rocksdb-fallthrough-i386.patch
-32bit-compat-service-daemon.patch

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