Github user The-Loeki commented on a diff in the pull request:

    https://github.com/apache/cloudstack/pull/1547#discussion_r63188699
  
    --- Diff: systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py ---
    @@ -66,8 +66,13 @@ def is_router(self):
         def get_domain(self):
             return self.cl.get_domain()
     
    +    def use_extdns(self):
    +        return self.cmdline().idata().get('useextdns', 'false') == 'true'
    +
         def get_dns(self):
    +        conf = self.cmdline().idata()
             dns = []
    +<<<<<<< e09480728f4ed77d0bd0bdc6a6c0966d90f7ee26
    --- End diff --
    
    Yeah spotted it just too late... Thought I fixxed it but my git-merge-fu 
isn't fully up to spec yet ;)


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

Reply via email to