[Pkg-ceph-commits] [ceph] 67/85: Refresh patches

[Gaudenz Steinlin]

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

gaudenz pushed a commit to branch jewel
in repository ceph.

commit cfa82f9f759458e94feb809b6468e077ba9639b7
Author: James Page <james.page at ubuntu.com>
Date:   Wed Dec 14 11:25:00 2016 +0000

    Refresh patches
---
 debian/patches/osd-limit-omap-data-in-push-op.patch | 2 +-
 debian/patches/rgw_rados-creation_time.patch        | 4 +---
 debian/patches/sleep-recover.patch                  | 2 +-
 debian/patches/tests-disable.patch                  | 4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/debian/patches/osd-limit-omap-data-in-push-op.patch b/debian/patches/osd-limit-omap-data-in-push-op.patch
index 1754ffe..918f158 100644
--- a/debian/patches/osd-limit-omap-data-in-push-op.patch
+++ b/debian/patches/osd-limit-omap-data-in-push-op.patch
@@ -17,7 +17,7 @@ Signed-off-by: Wanlong Gao <wanlong.gao at easystack.cn>
 
 --- a/src/common/config_opts.h
 +++ b/src/common/config_opts.h
-@@ -749,6 +749,7 @@ OPTION(osd_recovery_delay_start, OPT_FLO
+@@ -748,6 +748,7 @@ OPTION(osd_recovery_delay_start, OPT_FLO
  OPTION(osd_recovery_max_active, OPT_INT, 3)
  OPTION(osd_recovery_max_single_start, OPT_INT, 1)
  OPTION(osd_recovery_max_chunk, OPT_U64, 8<<20)  // max size of push chunk
diff --git a/debian/patches/rgw_rados-creation_time.patch b/debian/patches/rgw_rados-creation_time.patch
index ccc8e0e..c5e51fe 100644
--- a/debian/patches/rgw_rados-creation_time.patch
+++ b/debian/patches/rgw_rados-creation_time.patch
@@ -13,11 +13,9 @@ Signed-off-by: weiqiaomiao <wei.qiaomiao at zte.com.cn>
  src/rgw/rgw_rados.cc | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
-diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
-index d356fb8..8e0f0fd 100644
 --- a/src/rgw/rgw_rados.cc
 +++ b/src/rgw/rgw_rados.cc
-@@ -5156,10 +5156,11 @@ int RGWRados::create_bucket(RGWUserInfo& owner, rgw_bucket& bucket,
+@@ -5153,10 +5153,11 @@ int RGWRados::create_bucket(RGWUserInfo&
      info.num_shards = bucket_index_max_shards;
      info.bucket_index_shard_hash_type = RGWBucketInfo::MOD;
      info.requester_pays = false;
diff --git a/debian/patches/sleep-recover.patch b/debian/patches/sleep-recover.patch
index 2369611..d7ee410 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
-@@ -12014,6 +12014,7 @@ void Client::ms_handle_remote_reset(Conn
+@@ -12020,6 +12020,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/tests-disable.patch b/debian/patches/tests-disable.patch
index beed721..0038b96 100644
--- a/debian/patches/tests-disable.patch
+++ b/debian/patches/tests-disable.patch
@@ -5,7 +5,7 @@ Description: disable tests that depend on network...
 
 --- a/src/test/Makefile.am
 +++ b/src/test/Makefile.am
-@@ -63,6 +63,7 @@
+@@ -100,6 +100,7 @@ bin_DEBUGPROGRAMS += ceph_bench_log
  
  ## Unit tests
  
@@ -13,7 +13,7 @@ Description: disable tests that depend on network...
  check_SCRIPTS += \
  	test/ceph_objectstore_tool.py \
  	test/test-ceph-helpers.sh \
-@@ -96,6 +97,8 @@ check_SCRIPTS += \
+@@ -133,6 +134,8 @@ check_SCRIPTS += \
          test/test_pidfile.sh \
  	test/test_subman.sh
  

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