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/netns/setup.py.in
+++ b/netns/setup.py.in
@ -38,7 +38,6 @@ setup(
    ],
    url="https://github.com/coreemu/core",
    author="Boeing Research & Technology",
-    author_email="core-dev@nrl.navy.mil",
    license="BSD",
    long_description="Extension modules and utilities to support virtual nodes using Linux network namespaces",
 )