X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppetlabs-mysql%2F0001-Stx-uses-nanliu-staging-module.patch;fp=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppetlabs-mysql%2F0001-Stx-uses-nanliu-staging-module.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=ca028437ac1c943d57aadbc36255c55f26804f86;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-mysql/0001-Stx-uses-nanliu-staging-module.patch b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-mysql/0001-Stx-uses-nanliu-staging-module.patch
deleted file mode 100644
index ca02843..0000000
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-mysql/0001-Stx-uses-nanliu-staging-module.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3b1cb5e63416223336d2bd6a43f66007b9d388e3 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Thu, 31 Oct 2019 13:54:47 -0700
-Subject: [PATCH] Stx uses nanliu-staging module
-
-Use nanliu-staging instead of puppet-staging
----
- metadata.json | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/metadata.json b/metadata.json
-index 94e9d69..682c1e1 100644
---- a/metadata.json
-+++ b/metadata.json
-@@ -9,7 +9,7 @@
-   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
-   "dependencies": [
-     {"name":"puppetlabs/stdlib","version_requirement":">= 3.2.0 < 5.0.0"},
--    {"name":"puppet/staging","version_requirement":">= 1.0.1 < 3.0.0"}
-+    {"name":"nanliu/staging","version_requirement":">= 1.0.1 < 3.0.0"}
-   ],
-   "operatingsystem_support": [
-     {
--- 
-2.17.1
-