git.ipfire.org Git - thirdparty/bird.git/commit

]> git.ipfire.org Git - thirdparty/bird.git/commit

projects / thirdparty / bird.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2776cfa c408d80)

author	Jan Maria Matejka <mq@ucw.cz>
	Wed, 4 Apr 2018 08:42:54 +0000 (10:42 +0200)
committer	Jan Maria Matejka <mq@ucw.cz>
	Wed, 4 Apr 2018 08:42:54 +0000 (10:42 +0200)
commit	92bccd4ccdb8047f4721808c090508d51de13aa0
tree	32d98a5632e6e05ea28dc0c1a5903f0e5333cef2	tree
parent	2776cfafec3ae2ae3d6ed926fc6895577656d5db	commit \| diff
parent	c408d807a374b521dc66c434ca0dc5987820646f	commit \| diff

Merge branch 'int-new' into show-route

Updated static flowspec action definition to the new filter syntax.

conf/confbase.Y	diff1 \|	diff2 \|	blob \| history
lib/flowspec.h	diff1 \|	diff2 \|	blob \| history
lib/net.c	diff1 \|	diff2 \|	blob \| history
lib/printf.c	diff1 \|	diff2 \|	blob \| history
nest/cli.c	diff1 \|	diff2 \|	blob \| history
nest/rt-show.c	diff1 \|	diff2 \|	blob \| history
proto/static/config.Y	diff1 \|	diff2 \|	blob \| history

Mirror of https://gitlab.labs.nic.cz/labs/bird.git