]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
Merge branch 'cassandra-update' of https://github.com/andreipavelQ/kea into github35
authorTomek Mrugalski <tomasz@isc.org>
Mon, 18 Dec 2017 17:50:42 +0000 (18:50 +0100)
committerTomek Mrugalski <tomasz@isc.org>
Mon, 18 Dec 2017 17:50:42 +0000 (18:50 +0100)
1  2 
doc/guide/dhcp4-srv.xml
doc/guide/dhcp6-srv.xml
src/lib/dhcpsrv/Makefile.am
src/lib/dhcpsrv/tests/Makefile.am

Simple merge
Simple merge
Simple merge
Simple merge