]> git.ipfire.org Git - thirdparty/kea.git/commit
[master] Merge branch 'trac4626' (fixed fields in classification)
authorTomek Mrugalski <tomasz@isc.org>
Fri, 26 Aug 2016 11:41:15 +0000 (13:41 +0200)
committerTomek Mrugalski <tomasz@isc.org>
Fri, 26 Aug 2016 11:41:15 +0000 (13:41 +0200)
commit89cf54524d8b55cc982ab2146915c0a90fc6efe2
treef0ee3bffaa0b1dc9cf25a0c3c5c55b2200c69bb7
parentbb040d046aef63c7da840328876d1bebabde7a21
parentcee3a439b5064f3343ed90a4843e89ad424ef9da
[master] Merge branch 'trac4626' (fixed fields in classification)

# Conflicts:
# src/bin/dhcp4/dhcp4_srv.cc
doc/guide/dhcp4-srv.xml
src/bin/dhcp4/dhcp4_srv.cc
src/bin/dhcp4/dhcp4_srv.h