Merge branch '0.5.5'

2016-10-11 12:16:32 +03:00 · 2016-10-11 12:16:32 +03:00 · 74baa35a21
commit 74baa35a21
parent 4169660ae5 c04242a47f
1 changed files with 6 additions and 0 deletions
--- a/surok/discovery.py
+++ b/surok/discovery.py
@ -93,3 +93,9 @@ def do_query(fqdn, loglevel):
            return {"state": 404}

    return servers
+
+
+# Groups switch
+# Priority: config, environment, marathon environment
+def get_group(conf):
+    pass