Merge branch '0.5.5'

This commit is contained in:
Difrex 2016-10-11 12:16:32 +03:00
commit 74baa35a21

View File

@ -93,3 +93,9 @@ def do_query(fqdn, loglevel):
return {"state": 404} return {"state": 404}
return servers return servers
# Groups switch
# Priority: config, environment, marathon environment
def get_group(conf):
pass