[openstack-glance/el6] fix mismerge

Pádraig Brady pbrady at fedoraproject.org
Fri Feb 1 17:28:54 UTC 2013


commit b3669c78d05f5e25fcfd6dd868e60a30eebf4bbd
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Feb 1 17:28:13 2013 +0000

    fix mismerge

 ...end_password_leak_in_Glance_error_message.patch |   75 --------------------
 openstack-glance.spec                              |    1 -
 2 files changed, 0 insertions(+), 76 deletions(-)
---
diff --git a/openstack-glance.spec b/openstack-glance.spec
index dcee2f9..1514dac 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -109,7 +109,6 @@ This package contains documentation files for glance.
 %setup -q -n glance-%{version}
 
 %patch0001 -p1
-%patch0002 -p1
 
 %patch100 -p1
 %patch101 -p1


More information about the scm-commits mailing list