[Debian-ha-commits] [pcs] 07/08: Refresh patches

[Valentin Vidic]

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

vvidic-guest pushed a commit to branch master
in repository pcs.

commit dc327ccc03cd0f77ccde41b5e8b3980efb36b499
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Tue Jul 5 14:43:29 2016 +0200

    Refresh patches
---
 debian/patches/0008-Fix-corosync-log.patch |  2 +-
 debian/patches/0009-Fix-testsuite.patch    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/0008-Fix-corosync-log.patch b/debian/patches/0008-Fix-corosync-log.patch
index a0e5964..27d93f1 100644
--- a/debian/patches/0008-Fix-corosync-log.patch
+++ b/debian/patches/0008-Fix-corosync-log.patch
@@ -1,6 +1,6 @@
 --- a/pcs/cluster.py
 +++ b/pcs/cluster.py
-@@ -720,7 +720,7 @@
+@@ -726,7 +726,7 @@
          quorum_section.add_attribute("two_node", "1")
  
      logging_section.add_attribute("to_logfile", "yes")
diff --git a/debian/patches/0009-Fix-testsuite.patch b/debian/patches/0009-Fix-testsuite.patch
index 459d024..d799598 100644
--- a/debian/patches/0009-Fix-testsuite.patch
+++ b/debian/patches/0009-Fix-testsuite.patch
@@ -256,7 +256,7 @@
  
 --- a/pcs/test/test_stonith.py
 +++ b/pcs/test/test_stonith.py
-@@ -188,7 +188,7 @@
+@@ -191,7 +191,7 @@
  
          output, returnVal = pcs(
              temp_cib,
@@ -265,7 +265,7 @@
          )
          ac(output, "")
          self.assertEqual(0, returnVal)
-@@ -204,7 +204,7 @@
+@@ -207,7 +207,7 @@
   Resource: f3 (class=stonith type=fence_scsi)
    Meta Attrs: provides=unfencing 
    Operations: monitor interval=60s (f3-monitor-interval-60s)
@@ -274,7 +274,7 @@
    Meta Attrs: provides=something 
    Operations: monitor interval=60s (f4-monitor-interval-60s)
  """)
-@@ -237,7 +237,7 @@
+@@ -240,7 +240,7 @@
  
          output, returnVal = pcs(
              temp_cib,
@@ -283,7 +283,7 @@
          )
          ac(output, "")
          self.assertEqual(0, returnVal)
-@@ -256,7 +256,7 @@
+@@ -259,7 +259,7 @@
    Attributes: key=abc
    Meta Attrs: provides=unfencing 
    Operations: monitor interval=60s (f3-monitor-interval-60s)
@@ -294,7 +294,7 @@
  """)
 --- a/pcs/test/test_resource.py
 +++ b/pcs/test/test_resource.py
-@@ -2634,7 +2634,7 @@
+@@ -2640,7 +2640,7 @@
          assert output == " Master: D1-master-custom\n  Resource: D1 (class=ocf provider=heartbeat type=Dummy)\n   Operations: monitor interval=60s (D1-monitor-interval-60s)\n Resource: D0 (class=ocf provider=heartbeat type=Dummy)\n  Operations: monitor interval=60s (D0-monitor-interval-60s)\n Resource: D2 (class=ocf provider=heartbeat type=Dummy)\n  Operations: monitor interval=60s (D2-monitor-interval-60s)\n", [output]
  
      def testLSBResource(self):

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