diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-08-18 06:52:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-18 06:52:45 +0000 |
| commit | 277b8458769e24c1f7afc2d7e67332047d9f2a02 (patch) | |
| tree | 00df4e27d6b7190f48dafb704691ca8f7af5e191 | |
| parent | bab633b0310e68f79dc8624e27c88a3f2af99c61 (diff) | |
| parent | 3d33caa7dc0e67b9f5b34e76d3b1568fabadc3f5 (diff) | |
Merge "patches: linux.system.single fixed upstream"
| -rw-r--r-- | mcp/patches/reclass-system-salt-model/0002-linux.system.single-Fix-py-msgpack-identation.patch | 26 |
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 |