[openstack-heat] Updated patches from master-patches

[Jeff Peeler]

commit 6e91726ef11c1fb7a50cc1a01a9599d82c8c269c
Author: Jeff Peeler <jpeeler at redhat.com>
Date:   Mon Apr 14 11:10:59 2014 -0400

    Updated patches from master-patches

 0001-Switch-to-using-M2Crypto.patch                |    4 ++--
 0002-remove-pbr-runtime-dependency.patch           |    2 +-
 ...allow-building-against-python-oslo-sphinx.patch |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/0001-Switch-to-using-M2Crypto.patch b/0001-Switch-to-using-M2Crypto.patch
index 4e9b65c..645ec2d 100644
--- a/0001-Switch-to-using-M2Crypto.patch
+++ b/0001-Switch-to-using-M2Crypto.patch
@@ -1,4 +1,4 @@
-From b2011e91545d45d094162f3c0873a042a07d1bcd Mon Sep 17 00:00:00 2001
+From a400f4cca14b027a02656337a34c2a3fc92707a8 Mon Sep 17 00:00:00 2001
 From: Jeff Peeler <jpeeler at redhat.com>
 Date: Wed, 8 May 2013 12:27:35 -0400
 Subject: [PATCH] Switch to using M2Crypto
@@ -68,7 +68,7 @@ index c87678f..b3fdd45 100644
 +    res = cipher.update(auth[16:]) + cipher.final()
      return res
 diff --git a/requirements.txt b/requirements.txt
-index 8b41238..797d2ae 100644
+index d93023a..1acfb9b 100644
 --- a/requirements.txt
 +++ b/requirements.txt
 @@ -1,5 +1,6 @@
diff --git a/0002-remove-pbr-runtime-dependency.patch b/0002-remove-pbr-runtime-dependency.patch
index 6a7a517..43c5a31 100644
--- a/0002-remove-pbr-runtime-dependency.patch
+++ b/0002-remove-pbr-runtime-dependency.patch
@@ -1,4 +1,4 @@
-From e29b9b8a2bbfd36753c12d5be558581f02b85efa Mon Sep 17 00:00:00 2001
+From 9f2026d4d44c4e82dfcb44963f045f55a8422525 Mon Sep 17 00:00:00 2001
 From: Jeff Peeler <jpeeler at redhat.com>
 Date: Mon, 14 Oct 2013 14:30:34 -0400
 Subject: [PATCH] remove pbr runtime dependency
diff --git a/0003-Patch-to-allow-building-against-python-oslo-sphinx.patch b/0003-Patch-to-allow-building-against-python-oslo-sphinx.patch
index 93191a4..c5897b8 100644
--- a/0003-Patch-to-allow-building-against-python-oslo-sphinx.patch
+++ b/0003-Patch-to-allow-building-against-python-oslo-sphinx.patch
@@ -1,4 +1,4 @@
-From 4d151496649042db232bd572f7f089d634664d95 Mon Sep 17 00:00:00 2001
+From 39d3a36fd925f95ca74e8792137863d114298101 Mon Sep 17 00:00:00 2001
 From: Jeff Peeler <jpeeler at redhat.com>
 Date: Fri, 7 Mar 2014 11:50:58 -0500
 Subject: [PATCH] Patch to allow building against python-oslo-sphinx