]> git.ipfire.org Git - thirdparty/kea.git/commit
projects / thirdparty / kea.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 64350f6 4bd0c0e)
[master] Merge branch 'trac3464' (pool definitions are now structures)
authorTomek Mrugalski <tomasz@isc.org>
Fri, 8 Aug 2014 17:13:38 +0000 (19:13 +0200)
committerTomek Mrugalski <tomasz@isc.org>
Fri, 8 Aug 2014 17:13:38 +0000 (19:13 +0200)
commitf73452e8ea71af4564e63182a3dcf6b2bda66355
tree518ea2f5624937ad1780aac451be4cc8b3fe7e78tree
parent64350f6950e38e19db415ec967363468534142ddcommit | diff
parent4bd0c0eda9d86608f8802d28bd360239fe88e905commit | diff
[master] Merge branch 'trac3464' (pool definitions are now structures)

Conflicts:
ChangeLog
doc/examples/kea4/several-subnets.json
doc/examples/kea4/single-subnet.json
doc/examples/kea6/several-subnets.json
doc/guide/dhcp4-srv.xml
16 files changed:
ChangeLog diff1 | diff2 | blob | history
doc/examples/kea4/several-subnets.json diff1 | diff2 | blob | history
doc/examples/kea4/single-subnet.json diff1 | diff2 | blob | history
doc/examples/kea6/several-subnets.json diff1 | diff2 | blob | history
doc/guide/dhcp4-srv.xml diff1 | diff2 | blob | history
doc/guide/dhcp6-srv.xml diff1 | diff2 | blob | history
src/bin/dhcp4/tests/config_parser_unittest.cc diff1 | diff2 | blob | history
src/bin/dhcp4/tests/dhcp4_process_tests.sh.in diff1 | diff2 | blob | history
src/bin/dhcp4/tests/dhcp4_srv_unittest.cc diff1 | diff2 | blob | history
src/bin/dhcp4/tests/dora_unittest.cc diff1 | | blob | history
src/bin/dhcp4/tests/inform_unittest.cc diff1 | diff2 | blob | history
src/bin/dhcp4/tests/kea_controller_unittest.cc diff1 | diff2 | blob | history
src/bin/dhcp6/tests/confirm_unittest.cc diff1 | | blob | history
src/bin/dhcp6/tests/dhcp6_process_tests.sh.in diff1 | diff2 | blob | history
src/bin/dhcp6/tests/rebind_unittest.cc diff1 | diff2 | blob | history
src/bin/keactrl/tests/keactrl_tests.sh.in diff1 | diff2 | blob | history
Mirror of https://github.com/isc-projects/kea.git