From: Tomek Mrugalski Date: Sun, 15 Feb 2015 21:37:45 +0000 (+0100) Subject: [master] Merge branch 'trac3575' (doc update for host reservation) X-Git-Tag: trac3723_base~35 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a981e42eb0f39d27795364a6862b3a5e574e540a;p=thirdparty%2Fkea.git [master] Merge branch 'trac3575' (doc update for host reservation) Conflicts: doc/Makefile.am --- a981e42eb0f39d27795364a6862b3a5e574e540a diff --cc doc/Makefile.am index 933e221782,33095d530e..f6e66d79fb --- a/doc/Makefile.am +++ b/doc/Makefile.am @@@ -10,7 -10,7 +10,8 @@@ nobase_dist_doc_DATA += examples/kea6/s nobase_dist_doc_DATA += examples/kea6/several-subnets.json nobase_dist_doc_DATA += examples/kea6/multiple-options.json nobase_dist_doc_DATA += examples/kea6/advanced.json +nobase_dist_doc_DATA += examples/kea6/stateless.json + nobase_dist_doc_DATA += examples/kea6/reservations.json nobase_dist_doc_DATA += examples/ddns/sample1.json nobase_dist_doc_DATA += examples/ddns/template.json