niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into master-to-security

Browse source
This commit is contained in:
Erik Boasson 2020-03-19 08:18:48 +01:00
commit 67c49235db
110 changed files with 2714 additions and 4540 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/makernc.pl
View file

@ -475,7 +475,7 @@ sub conv_table {
$fqname1 = "$fqname/$fs->{name}";
$elems++;
}
my $prefix1 = ($fs->{table} eq "unsupp_cfgelems") ? "<b>Internal</b>" : $prefix;
my $prefix1 = ($fs->{table} eq "internal_cfgelems") ? "<b>Internal</b>" : $prefix;
&$convsub ($fh, $fs, $fs->{name}, $fqname1, $indent, $prefix1, $closure);
}
}

2
docs/manual/options.md
View file

@ -2002,7 +2002,7 @@ threads exist:
* dq.CHAN: delivery thread for channel CHAN;
* tev.CHAN: timed-even thread for channel CHAN.
* tev.CHAN: timed-event thread for channel CHAN.
##### //CycloneDDS/Domain/Threads/Thread/Scheduling