From 3de5ca9871876d1cdbb831e309f9f29749dd52af Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Mon, 15 Jun 2020 08:58:47 +0530 Subject: [PATCH] Merge remote-tracking branch 'origin/4.13' into 4.14 Fixes forward-merge lint issue Signed-off-by: Rohit Yadav --- systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py b/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py index abbe56b3c28..c2c00d5817a 100755 --- a/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py +++ b/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py @@ -189,10 +189,10 @@ class CsDhcp(CsDataBag): else: tag = entry['ipv4_address'].replace(".", "_") self.cloud.add("%s,set:%s,%s,%s,%s" % (entry['mac_address'], - tag, - entry['ipv4_address'], - entry['host_name'], - lease)) + tag, + entry['ipv4_address'], + entry['host_name'], + lease)) self.dhcp_opts.add("%s,%s" % (tag, 3)) self.dhcp_opts.add("%s,%s" % (tag, 6)) self.dhcp_opts.add("%s,%s" % (tag, 15))