[openstack-tripleo/f21] Revert "Updated patches from master-patches"
slagle
slagle at fedoraproject.org
Fri Oct 3 12:07:18 UTC 2014
commit 09c271049974b755ebeba0a21a928883172cf5b7
Author: James Slagle <jslagle at redhat.com>
Date: Fri Oct 3 08:05:39 2014 -0400
Revert "Updated patches from master-patches"
This reverts commit d8f43ef57b041818f0de60a0e42db4fd6a8b8e1d.
0001-Use-packaged-template-directory-path.patch | 2 +-
0002-Switch-back-to-oslo-sphinx.patch | 2 +-
0003-Support-passing-x86_64-to-create-nodes.patch | 60 ---------------------
openstack-tripleo.spec | 2 -
4 files changed, 2 insertions(+), 64 deletions(-)
---
diff --git a/0001-Use-packaged-template-directory-path.patch b/0001-Use-packaged-template-directory-path.patch
index d258467..74df581 100644
--- a/0001-Use-packaged-template-directory-path.patch
+++ b/0001-Use-packaged-template-directory-path.patch
@@ -1,4 +1,4 @@
-From bf35c5a7c23c7c1843f220be56fb5675d76af54f Mon Sep 17 00:00:00 2001
+From fcf6a7efb01497bdaa4424e491b2d325b4486fa1 Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle at redhat.com>
Date: Wed, 3 Sep 2014 17:13:40 -0400
Subject: [PATCH] Use packaged template directory path
diff --git a/0002-Switch-back-to-oslo-sphinx.patch b/0002-Switch-back-to-oslo-sphinx.patch
index da74028..5afd4ce 100644
--- a/0002-Switch-back-to-oslo-sphinx.patch
+++ b/0002-Switch-back-to-oslo-sphinx.patch
@@ -1,4 +1,4 @@
-From 3075504f77848d3dd024028454ac1ca7a3d85b66 Mon Sep 17 00:00:00 2001
+From 529524a6d17f3fa50e3af8c3453ea42bb2096b82 Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle at redhat.com>
Date: Wed, 3 Sep 2014 17:13:27 -0400
Subject: [PATCH] Switch back to oslo sphinx
diff --git a/openstack-tripleo.spec b/openstack-tripleo.spec
index 1f0c12b..424dbae 100644
--- a/openstack-tripleo.spec
+++ b/openstack-tripleo.spec
@@ -26,7 +26,6 @@ Requires: jq
#
Patch0001: 0001-Use-packaged-template-directory-path.patch
Patch0002: 0002-Switch-back-to-oslo-sphinx.patch
-Patch0003: 0003-Support-passing-x86_64-to-create-nodes.patch
%description
TripleO is a program aimed at installing, upgrading and operating OpenStack
@@ -55,7 +54,6 @@ This package contains documentation files for TripleO.
%patch0001 -p1
%patch0002 -p1
-%patch0003 -p1
%install
# scripts
More information about the scm-commits
mailing list