Merge branch 'develop' into FRR-patch-1

This commit is contained in:
bharnden 2019-04-24 22:56:24 -07:00 committed by GitHub
commit d584bbbcb1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 3645 additions and 151 deletions

View file

@ -58,3 +58,5 @@ emane_event_monitor = False
# EMANE log level range [0,4] default: 2
#emane_log_level = 2
emane_realtime = True
# prefix used for emane installation
# emane_prefix = /usr