vtysh/vtysh.c | 12 7 + 5 - 0 !
1 file changed, 7 insertions(+), 5 deletions(-)

 vtysh: fix pager compatibility handling

configure.ac | 1 1 + 0 - 0 !
tools/etc/frr/daemons | 2 1 + 1 - 0 !
tools/frrcommon.sh.in | 9 8 + 1 - 0 !
tools/frrinit.sh.in | 2 1 + 1 - 0 !
tools/watchfrr.sh.in | 2 1 + 1 - 0 !
watchfrr/watchfrr.c | 14 13 + 1 - 0 !
6 files changed, 25 insertions(+), 5 deletions(-)

 watchfrr: build in defaults for -r/-s/-k

tools/frr.service | 6 4 + 2 - 0 !
1 file changed, 4 insertions(+), 2 deletions(-)

 fix systemd install & dependencies

bgpd/bgpd.c | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 [patch] bgpd: add peer action for peer_flag_ifpeer_v6only flag
 peer_flag_modify() will always return BGP_ERR_INVALID_FLAG because
 the action was not defined for PEER_FLAG_IFPEER_V6ONLY flag.
 
 ```
 global PEER_FLAG_IFPEER_V6ONLY = 16384;
 global BGP_ERR_INVALID_FLAG = -2;
 probe process("/usr/lib/frr/bgpd").statement("peer_flag_modify@/root/frr/bgpd/bgpd.c:3975")
 {
 	if ($flag == PEER_FLAG_IFPEER_V6ONLY && $action->type == 0)
 		printf("action not found for the flag PEER_FLAG_IFPEER_V6ONLY\n");
 }
 probe process("/usr/lib/frr/bgpd").function("peer_flag_modify").return
 {
	if ($return == BGP_ERR_INVALID_FLAG)
		printf("return BGP_ERR_INVALID_FLAG\n");
 }
 ```
 produces:
 action not found for the flag PEER_FLAG_IFPEER_V6ONLY
 return BGP_ERR_INVALID_FLAG
$ vtysh -c 'conf t' -c 'router bgp 20' -c 'neighbor eth1 interface v6only remote-as external'
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>

bgpd/bgp_vty.c | 2 1 + 1 - 0 !
bgpd/bgpd.c | 19 11 + 8 - 0 !
tests/bgpd/test_peer_attr.py | 2 1 + 1 - 0 !
3 files changed, 13 insertions(+), 10 deletions(-)

 bgpd: interface based peers should automatically override it's peer group
 When a interface based peer is setup and if it is part of a peer
 group we should ignore this and just use the PEER_FLAG_CAPABILITY_ENHE
 no matter what.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>