merged latest from develop

This commit is contained in:
Blake Harnden 2020-06-13 18:07:21 -07:00
commit 83f66d33f7
16 changed files with 81 additions and 83 deletions

View file

@ -719,7 +719,7 @@ message LinkOptions {
int32 key = 3;
int32 mburst = 4;
int32 mer = 5;
float per = 6;
float loss = 6;
int64 bandwidth = 7;
int32 burst = 8;
int64 delay = 9;