0c4b868072
Problem: - Centos 7.5 upgraded puppet-horizons. - Porting of puppet-horizons patches did not resolve and 'fuzz' in the line numbers of the patches. - If puppet-horizon is built by rpm 4.11, or default version of rpm until 4.14 is compiled, a fuzzy patch results in the creating of an .orig file. - Packaging of puppet-horizons failes due to the unexpected, and unpackaged .orig file Solution: Safest solution is to de-fuzz our puppet-horizons patches. Story: 2003389 Task: 26755 Change-Id: Ica5404ab1135dd4d0e771f2dd03e46a3c6052c53 Signed-off-by: Sun Austin <austin.sun@intel.com>
25 lines
733 B
Diff
25 lines
733 B
Diff
From ece3e238c13425113f7882448a0e0fe40d07637c Mon Sep 17 00:00:00 2001
|
|
From: Jack Ding <jack.ding@windriver.com>
|
|
Date: Fri, 11 May 2018 21:45:24 -0400
|
|
Subject: [PATCH 3/3] update memcached dependency
|
|
|
|
---
|
|
metadata.json | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/metadata.json b/metadata.json
|
|
index 222be17..a9d8a91 100644
|
|
--- a/metadata.json
|
|
+++ b/metadata.json
|
|
@@ -47,6 +47,6 @@
|
|
"dependencies": [
|
|
{"name":"puppetlabs/apache","version_requirement":">=1.2.0 <2.0.0"},
|
|
{"name":"puppetlabs/stdlib","version_requirement":">=4.0.0 <5.0.0"},
|
|
- {"name":"saz/memcached","version_requirement":">=2.0.2 <3.0.0"}
|
|
+ {"name":"saz/memcached","version_requirement":">=2.0.2 <=3.0.2"}
|
|
]
|
|
}
|
|
--
|
|
2.7.4
|
|
|