[Pkg-ceph-commits] [ceph] 04/05: Sortout patch issues as part of merge of jewel branch

[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 25d769e14e0d1e0b3bf10579e976dc86bb72ceaa
Author: James Page <james.page at ubuntu.com>
Date:   Wed Feb 17 10:49:11 2016 +0000

    Sortout patch issues as part of merge of jewel branch
---
 debian/patches/fix-systemd-escaping.patch | 2 +-
 debian/patches/series                     | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/patches/fix-systemd-escaping.patch b/debian/patches/fix-systemd-escaping.patch
index 39ca842..0c6da0e 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
-@@ -2998,7 +2998,7 @@ def main_trigger(args):
+@@ -3389,7 +3389,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/series b/debian/patches/series
index e5237a9..eb26730 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,7 +16,5 @@ tests-disable.patch
 ceph-osd-prestart-path.patch
 fix-argparse-defaults.patch
 fix-cycles-arch.patch
-#vivid-does-systemd.patch
-flock-location-debian.patch
-ceph-detect-init-ubuntu.patch
+pybind-flags.patch
 fix-systemd-escaping.patch

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