Merge branch 'master' into core-rest-flask

configure.ac

@@ -226,8 +226,8 @@ ${PACKAGE_STRING} Configuration:
 Build:
   Host System Type:           ${host}
   C Compiler and flags:       ${CC} ${CFLAGS}
-  Prefix:             	      ${prefix}
-  Exec Prefix:		          ${exec_prefix}
+  Prefix:                     ${prefix}
+  Exec Prefix:                ${exec_prefix}
 
 GUI:
   GUI path:                   ${CORE_LIB_DIR}
@@ -239,11 +239,11 @@ Daemon:
   Python modules:             ${pythondir}
   Logs:                       ${CORE_STATE_DIR}/log
 
-Startup:		              ${with_startup}
+Startup:                      ${with_startup}
 
 Features to build:
   Build GUI:                  ${enable_gui}
-  Build Daemon:		          ${enable_daemon}
+  Build Daemon:               ${enable_daemon}
   Documentation:              ${want_docs}
 
 ------------------------------------------------------------------------"

daemon/core/emulator/coreemu.py

@@ -854,12 +854,13 @@ class CoreEmu(object):
         for session in sessions.itervalues():
             session.shutdown()
 
-    def create_session(self, _id=None, master=True):
+    def create_session(self, _id=None, master=True, _cls=EmuSession):
         """
         Create a new CORE session, set to master if running standalone.
 
         :param int _id: session id for new session
         :param bool master: sets session to master
+        :param class _cls: EmuSession class to use
         :return: created session
         :rtype: EmuSession
         """
@@ -871,7 +872,7 @@ class CoreEmu(object):
                 if session_id not in self.sessions:
                     break
 
-        session = EmuSession(session_id, config=self.config)
+        session = _cls(session_id, config=self.config)
         logger.info("created session: %s", session_id)
         if master:
             session.master = True

daemon/data/core-daemon.logrotate

@@ -1,13 +0,0 @@
-/var/log/core-daemon.log {
-    rotate 7
-    daily
-    missingok
-    notifempty
-    compress
-    sharedscripts
-    postrotate
-        if [ -r /var/run/core-daemon.pid ]; then
-            kill -USR1 $(cat /var/run/core-daemon.pid) > /dev/null 2>&1
-        fi
-    endscript
-}

docs/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-cayman

docs/install.md

@@ -170,6 +170,12 @@ This option is listed here for developers and advanced users who are comfortable
 
 To build CORE from source on Ubuntu, first install these development packages. These packages are not required for normal binary package installs.
 
+#### Ubuntu 18.04 pre-reqs
+
+```shell
+sudo apt install automake pkg-config gcc libev-dev bridge-utils ebtables python-dev python-sphinx python-setuptools python-lxml python-enum34 tk libtk-img
+```
+
 #### Ubuntu 16.04 Requirements
 
 ```shell