You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2020/06/15 03:30:00 UTC
[cloudstack] branch 4.14 updated: Merge remote-tracking branch
'origin/4.13' into 4.14
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.14
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.14 by this push:
new 3de5ca9 Merge remote-tracking branch 'origin/4.13' into 4.14
3de5ca9 is described below
commit 3de5ca9871876d1cdbb831e309f9f29749dd52af
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Mon Jun 15 08:58:47 2020 +0530
Merge remote-tracking branch 'origin/4.13' into 4.14
Fixes forward-merge lint issue
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
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 abbe56b..c2c00d5 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))