]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
projects / thirdparty / kea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7503002 59ac2f9)
[trac3565] Merge branch 'trac3575' into trac3565 (HR docs)
authorTomek Mrugalski <tomasz@isc.org>
Mon, 16 Feb 2015 11:57:39 +0000 (12:57 +0100)
committerTomek Mrugalski <tomasz@isc.org>
Mon, 16 Feb 2015 11:57:39 +0000 (12:57 +0100)
Conflicts:
doc/Makefile.am

1  2 
doc/Makefile.am patch | diff1 | diff2 | blob | history
doc/guide/dhcp4-srv.xml patch | diff1 | diff2 | blob | history
doc/guide/dhcp6-srv.xml patch | diff1 | diff2 | blob | history

diff --cc doc/Makefile.am
index 933e2217823547018dc7cd105daab05337fa9b9f,33095d530e70fbced973640a89980b8e78675959..f6e66d79fbe475a9be7d808bd9ca017eef192ffe
--- 1/doc/Makefile.am
--- 2/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
  
diff --cc doc/guide/dhcp4-srv.xml
Simple merge
diff --cc doc/guide/dhcp6-srv.xml
Simple merge
Mirror of https://github.com/isc-projects/kea.git