Ondrej Zajicek 736e143fa5 Merge branch 'master' into add-path ...

Conflicts:

	filter/filter.c
	nest/proto.c
	nest/rt-table.c
	proto/bgp/bgp.h
	proto/bgp/config.Y

2013-11-23 11:50:34 +01:00

..

config.Y

Rewrites static attribute filter code and adds ifname/ifindex attributes.

2013-09-26 22:08:21 +02:00

Doc

…

f-util.c

Implements wildcard matching in config file include.

2012-07-18 19:29:33 +02:00

filter.c

Merge branch 'master' into add-path

2013-11-23 11:50:34 +01:00

filter.h

Merge commit 'origin/bfd'

2013-11-22 02:48:44 +01:00

Makefile

…

test6.conf

…

test.conf

Minor fix in log_commit() w.r.t. changes in BFD branch.

2013-11-22 21:58:43 +01:00

test.conf2

…

test.conf.inc

Implements wildcard matching in config file include.

2012-07-18 19:29:33 +02:00

tree.c

Merge commit 'origin/bfd'

2013-11-22 02:48:44 +01:00

trie.c

Merge commit 'origin/bfd'

2013-11-22 02:48:44 +01:00