Ondrej Zajicek (work) 72163bd5f3 Nest: Allow modification of channels inherited from templates ... Multiple definitions of same channels are forbidden, but inherited channel can be redefined. In such case channel options are merged.		2018-01-09 18:42:22 +01:00
..
babel	Merge commit '1e8721e2aeccfbc3f533e8b8abc07582cee77e9a' into int-new	2017-12-07 21:54:47 +01:00
bfd	Minor fixes for debug mode	2017-12-16 16:31:43 +01:00
bgp	Nest: Allow modification of channels inherited from templates	2018-01-09 18:42:22 +01:00
ospf	Nest: Allow modification of channels inherited from templates	2018-01-09 18:42:22 +01:00
pipe	Nest: Allow modification of channels inherited from templates	2018-01-09 18:42:22 +01:00
radv	Nest: Allow modification of channels inherited from templates	2018-01-09 18:42:22 +01:00
rip	Nest: Allow modification of channels inherited from templates	2018-01-09 18:42:22 +01:00
rpki	Nest: Allow modification of channels inherited from templates	2018-01-09 18:42:22 +01:00
static	Lib: Fix macro/keyword collisions	2017-12-10 13:16:31 +01:00
Doc	RPKI protocol with one cache server per protocol	2016-12-07 09:35:24 +01:00