[Pkg-ceph-commits] [ceph] 05/07: (see http://pad.lv/1563714 for FFe): - d/p/*: Refresh.
James Downing Page
jamespage at moszumanska.debian.org
Fri Apr 8 15:35:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch ubuntu-xenial
in repository ceph.
commit 8d80505e6da5588164b1756ca187053c0cd67cf5
Author: James Page <james.page at ubuntu.com>
Date: Fri Apr 8 12:10:31 2016 +0100
(see http://pad.lv/1563714 for FFe): - d/p/*: Refresh.
---
debian/changelog | 3 ++-
debian/patches/32bit-compat.patch | 21 +--------------------
debian/patches/arch.patch | 2 +-
debian/patches/fix-cycles-arch.patch | 2 +-
debian/patches/sleep-recover.patch | 2 +-
debian/patches/tasksmax-infinity.patch | 10 ----------
debian/patches/tests-disable.patch | 4 ++--
7 files changed, 8 insertions(+), 36 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 14d7986..d97592e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
ceph (10.1.1-0ubuntu1) UNRELEASED; urgency=medium
* New upstream release candidate for Ceph Jewel
- (see http://pad.lv/1563714 for FFe).
+ (see http://pad.lv/1563714 for FFe):
+ - d/p/*: Refresh.
-- James Page <james.page at ubuntu.com> Fri, 08 Apr 2016 12:09:25 +0100
diff --git a/debian/patches/32bit-compat.patch b/debian/patches/32bit-compat.patch
index 8c8ae71..d16cf7c 100644
--- a/debian/patches/32bit-compat.patch
+++ b/debian/patches/32bit-compat.patch
@@ -12,11 +12,9 @@ Signed-off-by: Adam C. Emerson <aemerson at redhat.com>
src/common/ceph_time.h | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
-diff --git a/src/common/ceph_time.h b/src/common/ceph_time.h
-index ef187c0..2c7061a 100644
--- a/src/common/ceph_time.h
+++ b/src/common/ceph_time.h
-@@ -382,10 +382,13 @@ void encode(const std::chrono::time_point<Clock, Duration>& t,
+@@ -382,10 +382,13 @@ void encode(const std::chrono::time_poin
template<typename Clock, typename Duration>
void decode(std::chrono::time_point<Clock, Duration>& t,
bufferlist::iterator& p) {
@@ -32,23 +30,6 @@ index ef187c0..2c7061a 100644
t = Clock::from_timespec(ts);
}
-
-From 8f9e7b0b1db4eaa45cb603eae5b7f1040135de26 Mon Sep 17 00:00:00 2001
-From: "Adam C. Emerson" <aemerson at redhat.com>
-Date: Thu, 31 Mar 2016 16:08:08 -0400
-Subject: [PATCH 2/2] rgw: Do not try to encode or decode time_t
-
-time_t's width varies between machines. Also it fails to compile on 32
-bit linux.
-
-Fixes: http://tracker.ceph.com/issues/15330
-Signed-off-by: Adam C. Emerson <aemerson at redhat.com>
----
- src/cls/rgw/cls_rgw_ops.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/cls/rgw/cls_rgw_ops.h b/src/cls/rgw/cls_rgw_ops.h
-index e8a7661..7d8ad2d 100644
--- a/src/cls/rgw/cls_rgw_ops.h
+++ b/src/cls/rgw/cls_rgw_ops.h
@@ -180,7 +180,7 @@ struct rgw_cls_link_olh_op {
diff --git a/debian/patches/arch.patch b/debian/patches/arch.patch
index 7f21ff1..09c3767 100644
--- a/debian/patches/arch.patch
+++ b/debian/patches/arch.patch
@@ -6,7 +6,7 @@ Description: use `dpkg-architecture` instead of `arch` to get build architecture
--- a/configure.ac
+++ b/configure.ac
-@@ -236,7 +236,7 @@ AC_CHECK_PROG(YASM_CHECK, yasm, yes)
+@@ -244,7 +244,7 @@ AC_CHECK_PROG(YASM_CHECK, yasm, yes)
if test x"$YASM_CHECK" = x"yes"; then
if yasm -f elf64 src/common/crc32c_intel_fast_asm.S -o /dev/null; then
echo 'we have a modern and working yasm'
diff --git a/debian/patches/fix-cycles-arch.patch b/debian/patches/fix-cycles-arch.patch
index 2df54bf..c441663 100644
--- a/debian/patches/fix-cycles-arch.patch
+++ b/debian/patches/fix-cycles-arch.patch
@@ -6,7 +6,7 @@ Forwarded: no
--- a/src/common/Cycles.cc
+++ b/src/common/Cycles.cc
-@@ -56,6 +56,10 @@ void Cycles::init()
+@@ -57,6 +57,10 @@ void Cycles::init()
if (rdtsc() == 0)
return;
diff --git a/debian/patches/sleep-recover.patch b/debian/patches/sleep-recover.patch
index 070d9a3..5eca0d1 100644
--- a/debian/patches/sleep-recover.patch
+++ b/debian/patches/sleep-recover.patch
@@ -6,7 +6,7 @@ Description: fix fuse-client hang after wake-up from suspend.
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
-@@ -11882,6 +11882,7 @@ void Client::ms_handle_remote_reset(Conn
+@@ -11918,6 +11918,7 @@ void Client::ms_handle_remote_reset(Conn
case MetaSession::STATE_OPEN:
ldout(cct, 1) << "reset from mds we were open; mark session as stale" << dendl;
s->state = MetaSession::STATE_STALE;
diff --git a/debian/patches/tasksmax-infinity.patch b/debian/patches/tasksmax-infinity.patch
index 4008e5b..89f5f3b 100644
--- a/debian/patches/tasksmax-infinity.patch
+++ b/debian/patches/tasksmax-infinity.patch
@@ -19,8 +19,6 @@ Signed-off-by: James Page <james.page at ubuntu.com>
systemd/ceph-rbd-mirror at .service | 1 +
5 files changed, 5 insertions(+)
-diff --git a/systemd/ceph-mds at .service b/systemd/ceph-mds at .service
-index e122580..f13cef4 100644
--- a/systemd/ceph-mds at .service
+++ b/systemd/ceph-mds at .service
@@ -15,6 +15,7 @@ PrivateDevices=yes
@@ -31,8 +29,6 @@ index e122580..f13cef4 100644
[Install]
WantedBy=ceph-mds.target
-diff --git a/systemd/ceph-mon at .service b/systemd/ceph-mon at .service
-index a8d427b..b9501d6 100644
--- a/systemd/ceph-mon at .service
+++ b/systemd/ceph-mon at .service
@@ -21,6 +21,7 @@ PrivateDevices=yes
@@ -43,8 +39,6 @@ index a8d427b..b9501d6 100644
[Install]
WantedBy=ceph-mon.target
-diff --git a/systemd/ceph-osd at .service b/systemd/ceph-osd at .service
-index 0d73afb..1778db7 100644
--- a/systemd/ceph-osd at .service
+++ b/systemd/ceph-osd at .service
@@ -15,6 +15,7 @@ ExecReload=/bin/kill -HUP $MAINPID
@@ -55,8 +49,6 @@ index 0d73afb..1778db7 100644
[Install]
WantedBy=ceph-osd.target
-diff --git a/systemd/ceph-radosgw at .service b/systemd/ceph-radosgw at .service
-index 66d9eb8..cfa5788 100644
--- a/systemd/ceph-radosgw at .service
+++ b/systemd/ceph-radosgw at .service
@@ -14,6 +14,7 @@ PrivateDevices=yes
@@ -67,8 +59,6 @@ index 66d9eb8..cfa5788 100644
[Install]
WantedBy=ceph-radosgw.target
-diff --git a/systemd/ceph-rbd-mirror at .service b/systemd/ceph-rbd-mirror at .service
-index 4c2e2f0..d38aec5 100644
--- a/systemd/ceph-rbd-mirror at .service
+++ b/systemd/ceph-rbd-mirror at .service
@@ -17,6 +17,7 @@ PrivateTmp=true
diff --git a/debian/patches/tests-disable.patch b/debian/patches/tests-disable.patch
index 0808f9e..7012f49 100644
--- a/debian/patches/tests-disable.patch
+++ b/debian/patches/tests-disable.patch
@@ -13,7 +13,7 @@ Description: disable tests that depend on network...
check_SCRIPTS += \
test/ceph_objectstore_tool.py \
test/test-ceph-helpers.sh \
-@@ -93,6 +94,7 @@ check_SCRIPTS += \
+@@ -94,6 +95,7 @@ check_SCRIPTS += \
test/libradosstriper/rados-striper.sh \
test/test_objectstore_memstore.sh \
test/test_pidfile.sh
@@ -23,7 +23,7 @@ Description: disable tests that depend on network...
$(srcdir)/test/python/brag-client/setup.py \
--- a/configure.ac
+++ b/configure.ac
-@@ -1341,6 +1341,13 @@ AC_LANG_POP([C++])
+@@ -1349,6 +1349,13 @@ AC_LANG_POP([C++])
AM_CONDITIONAL(WITH_BUILD_TESTS, test "$WITH_BUILD_TESTS" = "1")
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git
More information about the Pkg-ceph-commits
mailing list