merged latest from develop

2019-06-03 13:06:11 -07:00 · 2019-06-03 13:06:11 -07:00 · 7efec88e79
commit 7efec88e79
parent bb5e68ad8b a8061b811d
178 changed files with 11969 additions and 692 deletions
--- a/daemon/core/emulator/emudata.py
+++ b/daemon/core/emulator/emudata.py
@ -79,7 +79,7 @@ class NodeOptions(object):
    Options for creating and updating nodes within core.
    """

-    def __init__(self, name=None, model="router"):
+    def __init__(self, name=None, model="PC"):
        """
        Create a NodeOptions object.