Repository: cloudstack Updated Branches: refs/heads/4.9 50f80cc2a -> 6a449e4b3
systemvm: Fix regression from 825935 Fixes merge conflict issue incorrectly fixed during a fwd-merge in 825935 from PR #1766 Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cc72e4da Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cc72e4da Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cc72e4da Branch: refs/heads/4.9 Commit: cc72e4da64e28ecf948246684233bbe8cfa46ab6 Parents: 50f80cc Author: Rohit Yadav <[email protected]> Authored: Sun Nov 27 15:43:10 2016 +0530 Committer: Rohit Yadav <[email protected]> Committed: Sun Nov 27 15:43:10 2016 +0530 ---------------------------------------------------------------------- systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cc72e4da/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py index 3ede478..23b7499 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py @@ -137,15 +137,15 @@ class CsDhcp(CsDataBag): if entry['default_entry'] == True: self.cloud.add("%s,%s,%s,%sh" % (entry['mac_address'], entry['ipv4_adress'], - entry['host_name']), - lease) + entry['host_name'], + lease)) else: tag = entry['ipv4_adress'].replace(".","_") self.cloud.add("%s,set:%s,%s,%s,%sh" % (entry['mac_address'], tag, entry['ipv4_adress'], - entry['host_name']), - lease) + 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))
