[Pkg-ceph-commits] [ceph] 04/05: Refresh patches

[James Downing Page]

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

jamespage pushed a commit to branch experimental
in repository ceph.

commit 20adc7d6f57264b1588c69f0d4d6acddb5c878fc
Author: James Page <james.page at ubuntu.com>
Date:   Wed Nov 4 11:18:54 2015 +0000

    Refresh patches
---
 debian/patches/fix-argparse-defaults.patch | 4 ++--
 debian/patches/fix-cycles-arch.patch       | 4 ++--
 debian/patches/sleep-recover.patch         | 2 +-
 debian/patches/tests-disable.patch         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/fix-argparse-defaults.patch b/debian/patches/fix-argparse-defaults.patch
index 79eff01..e9e1267 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
-@@ -2745,7 +2745,6 @@ def parse_args():
+@@ -2749,7 +2749,6 @@ def parse_args():
      parser.set_defaults(
          # we want to hold on to this, for later
          prog=parser.prog,
@@ -16,7 +16,7 @@ Forwarded: no
          )
  
      subparsers = parser.add_subparsers(
-@@ -2759,6 +2758,7 @@ def parse_args():
+@@ -2763,6 +2762,7 @@ def parse_args():
          '--cluster',
          metavar='NAME',
          help='cluster name to assign this disk to',
diff --git a/debian/patches/fix-cycles-arch.patch b/debian/patches/fix-cycles-arch.patch
index 492d4cc..2df54bf 100644
--- a/debian/patches/fix-cycles-arch.patch
+++ b/debian/patches/fix-cycles-arch.patch
@@ -6,8 +6,8 @@ Forwarded: no
 
 --- a/src/common/Cycles.cc
 +++ b/src/common/Cycles.cc
-@@ -52,6 +52,10 @@ void Cycles::init()
-   if (cycles_per_sec != 0)
+@@ -56,6 +56,10 @@ void Cycles::init()
+   if (rdtsc() == 0)
      return;
  
 +  // Skip initialization if rtdsc is not implemented
diff --git a/debian/patches/sleep-recover.patch b/debian/patches/sleep-recover.patch
index 15dfe4e..115e5cc 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
-@@ -10448,6 +10448,7 @@ void Client::ms_handle_remote_reset(Conn
+@@ -10467,6 +10467,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 09cc71d..9056fb9 100644
--- a/debian/patches/tests-disable.patch
+++ b/debian/patches/tests-disable.patch
@@ -23,7 +23,7 @@ Description: disable tests that depend on network...
  check_SCRIPTS += test/ceph-disk-root.sh
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1147,6 +1147,13 @@ AC_LANG_POP([C++])
+@@ -1181,6 +1181,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