git.ipfire.org Git - thirdparty/kea.git/commit

]> git.ipfire.org Git - thirdparty/kea.git/commit

projects / thirdparty / kea.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6eb6622 757afa4)

author	Francis Dupont <fdupont@isc.org>
	Wed, 12 Sep 2018 10:24:17 +0000 (12:24 +0200)
committer	Francis Dupont <fdupont@isc.org>
	Wed, 12 Sep 2018 10:24:17 +0000 (12:24 +0200)
commit	bf1f2dddbaf4e837ee999c3b2f4fccc46b31b1d8
tree	90c135ad7d59dbd1fd8b2b38cbba417515f5ac7b	tree \| snapshot
parent	6eb662297d7c2cc0e8a1ef0148726dc662e46dcd	commit \| diff
parent	757afa454581a98f4760363dfaad643e251929e0	commit \| diff

[65-libyang-generic] Resolved conflicts and fixed watcher.h

src/lib/yang/models/ietf-dhcpv4-options.yang	blob1 \|	blob2 \|	history
src/lib/yang/models/ietf-dhcpv4-types.yang	blob1 \|	blob2 \|	history
src/lib/yang/models/kea-dhcpv4-server.yang	blob1 \|	blob2 \|	history
src/lib/yang/sysrepo_connection.cc	diff1 \|	diff2 \|	blob \| history
src/lib/yang/tests/keatest-module.yang	diff1 \|	diff2 \|	blob \| history
src/lib/yang/translator.h	diff1 \|	diff2 \|	blob \| history

Mirror of https://github.com/isc-projects/kea.git