Tomek Mrugalski 1cf853c595 [master] Merge branch 'trac5017' (dhcp4 bison parser) ...

# Conflicts:
#	doc/examples/kea4/classify.json

2016-12-20 22:08:33 +01:00

..

advanced.json

[5017] Addressed two minor comments:

2016-12-20 22:05:57 +01:00

backends.json

[5072] lfc-interval has been added to the example configs.

2016-12-15 15:05:56 +01:00

classify.json

[5017] Support for several v4 specific keywords implemented:

2016-12-16 18:33:23 +01:00

dhcpv4-over-dhcpv6.json

[5072] Two small corrections in example configs.

2016-12-15 15:21:47 +01:00

hooks.json

[5017] Examples for echo-client-id and match-client-id added.

2016-12-16 18:57:48 +01:00

leases-expiration.json

[5072] lfc-interval has been added to the example configs.

2016-12-15 15:05:56 +01:00

multiple-options.json

[3684] Updated configuration examples per second round of review.

2016-09-13 10:39:44 +02:00

mysql-reservations.json

[5072] lfc-interval has been added to the example configs.

2016-12-15 15:05:56 +01:00

pgsql-reservations.json

[3684] Updated configuration examples per second round of review.

2016-09-13 10:39:44 +02:00

reservations.json

[master] Merge branch 'trac5017' (dhcp4 bison parser)

2016-12-20 22:08:33 +01:00

several-subnets.json

[5017] Examples for echo-client-id and match-client-id added.

2016-12-16 18:57:48 +01:00

single-subnet.json

[5072] lfc-interval has been added to the example configs.

2016-12-15 15:05:56 +01:00