Ondrej Zajicek bf2abe2f51 Merge branch 'soon' ...

Conflicts:

	nest/proto.c
	nest/rt-table.c

2012-03-30 11:04:12 +02:00

..

a-path.c

…

a-set.c

Extends set operations in filters.

2012-03-15 21:07:58 +01:00

attrs.h

Extends set operations in filters.

2012-03-15 21:07:58 +01:00

bird.h

…

cli.c

…

cli.h

…

cmds.c

Route Origin Authorization basics.

2012-03-18 17:32:30 +01:00

cmds.h

Adds filtering to 'show symbols' command.

2012-03-16 12:47:12 +01:00

config.Y

Some minor changes to CLI.

2012-03-22 12:13:26 +01:00

Doc

…

iface.c

…

iface.h

…

locks.c

…

locks.h

…

Makefile

Route Origin Authorization basics.

2012-03-18 17:32:30 +01:00

mrtdump.h

…

neighbor.c

…

password.c

…

password.h

…

proto-hooks.c

Better support for multitable protocols.

2012-03-15 12:13:04 +01:00

proto.c

Merge branch 'soon'

2012-03-30 11:04:12 +02:00

proto.sgml

…

protocol.h

Merge branch 'soon'

2012-03-30 11:04:12 +02:00

route.h

Merge branch 'soon'

2012-03-30 11:04:12 +02:00

rt-attr.c

…

rt-dev.c

Assign default protocol preference via proto_config_new().

2012-01-24 11:31:00 +01:00

rt-dev.h

…

rt-fib.c

…

rt-roa.c

Some minor changes to CLI.

2012-03-22 12:13:26 +01:00

rt-table.c

Merge branch 'soon'

2012-03-30 11:04:12 +02:00