aboutsummaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-17 20:44:28 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-17 18:55:26 +0000
commit3d33caa7dc0e67b9f5b34e76d3b1568fabadc3f5 (patch)
tree528586cb6586184f98859145511e58268ff3bc89 /mcp
parentdc0e2355b21ab954456c9db7af1161359c966d57 (diff)
patches: linux.system.single fixed upstream
Fixed upstream in [1], drop our patch. [1] https://github.com/Mirantis/reclass-system-salt-model/commit/573be77 Change-Id: Ieeb9b87cac0418d860bbf04e5e8ffd48898a213e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp')
-rw-r--r--mcp/patches/reclass-system-salt-model/0002-linux.system.single-Fix-py-msgpack-identation.patch26
1 files changed, 0 insertions, 26 deletions
diff --git a/mcp/patches/reclass-system-salt-model/0002-linux.system.single-Fix-py-msgpack-identation.patch b/mcp/patches/reclass-system-salt-model/0002-linux.system.single-Fix-py-msgpack-identation.patch
deleted file mode 100644
index 799a9cf97..000000000
--- a/mcp/patches/reclass-system-salt-model/0002-linux.system.single-Fix-py-msgpack-identation.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Mon, 14 Aug 2017 23:44:05 +0200
-Subject: [PATCH] linux.system.single: Fix py-msgpack identation
-
-Broken upstream since commit [1], adjust it accordingly.
-
-[1] https://github.com/Mirantis/reclass-system-salt-model/commit/517e5ff
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- linux/system/single.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/linux/system/single.yml b/linux/system/single.yml
-index 4c5228f..e2a8502 100644
---- a/linux/system/single.yml
-+++ b/linux/system/single.yml
-@@ -12,7 +12,7 @@ parameters:
- name: root
- home: /root
- package:
-- python-msgpack:
-+ python-msgpack:
- version: latest
- cloud-init:
- version: purged