[Pkg-ceph-commits] [ceph] 03/14: Refresh patches

[James Downing Page]

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

jamespage pushed a commit to branch ubuntu-xenial
in repository ceph.

commit 4870228d7fce1a3a985d9c769afd23cfbe879db5
Author: James Page <james.page at ubuntu.com>
Date:   Wed Feb 24 12:48:23 2016 +0000

    Refresh patches
---
 debian/patches/fix-argparse-defaults.patch   | 2 +-
 debian/patches/fix-systemd-escaping.patch    | 2 +-
 debian/patches/sleep-recover.patch           | 2 +-
 debian/patches/tests-disable-ceph-disk.patch | 2 +-
 debian/patches/tests-disable.patch           | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/fix-argparse-defaults.patch b/debian/patches/fix-argparse-defaults.patch
index 55d00e3..1dfb2e5 100644
--- a/debian/patches/fix-argparse-defaults.patch
+++ b/debian/patches/fix-argparse-defaults.patch
@@ -8,7 +8,7 @@ Forwarded: no
 
 --- a/src/ceph-disk
 +++ b/src/ceph-disk
-@@ -3627,6 +3627,7 @@ def parse_args(argv):
+@@ -3618,6 +3618,7 @@ def parse_args(argv):
      parser.set_defaults(
          # we want to hold on to this, for later
          prog=parser.prog,
diff --git a/debian/patches/fix-systemd-escaping.patch b/debian/patches/fix-systemd-escaping.patch
index 0c6da0e..01b197b 100644
--- a/debian/patches/fix-systemd-escaping.patch
+++ b/debian/patches/fix-systemd-escaping.patch
@@ -5,7 +5,7 @@ Forwarded: https://github.com/ceph/ceph/pull/7579
 
 --- a/src/ceph-disk
 +++ b/src/ceph-disk
-@@ -3389,7 +3389,7 @@ def main_trigger(args):
+@@ -3380,7 +3380,7 @@ def main_trigger(args):
      LOG.debug("main_trigger: " + str(args))
      if is_systemd() and not args.sync:
          # http://www.freedesktop.org/software/systemd/man/systemd-escape.html
diff --git a/debian/patches/sleep-recover.patch b/debian/patches/sleep-recover.patch
index 47c4367..c765239 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
-@@ -11159,6 +11159,7 @@ void Client::ms_handle_remote_reset(Conn
+@@ -11829,6 +11829,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-ceph-disk.patch b/debian/patches/tests-disable-ceph-disk.patch
index f2e3da9..d4a1d3f 100644
--- a/debian/patches/tests-disable-ceph-disk.patch
+++ b/debian/patches/tests-disable-ceph-disk.patch
@@ -5,7 +5,7 @@ Description: disable (FS-dependent?) "ceph-disk" test which always seems to fail
 
 --- a/src/test/Makefile.am
 +++ b/src/test/Makefile.am
-@@ -88,8 +88,6 @@ check_SCRIPTS += \
+@@ -91,8 +91,6 @@ check_SCRIPTS += \
  	test/libradosstriper/rados-striper.sh \
  	test/test_objectstore_memstore.sh
  
diff --git a/debian/patches/tests-disable.patch b/debian/patches/tests-disable.patch
index c816954..bc05314 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
-@@ -62,6 +62,7 @@ bin_DEBUGPROGRAMS += ceph_bench_log
+@@ -63,6 +63,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 \
-@@ -87,6 +88,7 @@ check_SCRIPTS += \
+@@ -90,6 +91,7 @@ check_SCRIPTS += \
  	test/mon/mon-handle-forward.sh \
  	test/libradosstriper/rados-striper.sh \
  	test/test_objectstore_memstore.sh
@@ -23,7 +23,7 @@ Description: disable tests that depend on network...
  	$(srcdir)/test/python/ceph-disk/setup.py \
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1382,6 +1382,13 @@ AC_LANG_POP([C++])
+@@ -1389,6 +1389,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