Tomek Mrugalski
28f32bb5f7
Merge branch 'kea-fb2' of https://github.com./nchaigne/kea into pullreq8
...
# Conflicts:
# src/bin/dhcp4/dhcp4_hooks.dox
2015-11-30 13:12:05 +01:00
Tomek Mrugalski
2bb34411ac
[master] ChangeLog updated.
2015-11-30 13:03:10 +01:00
Tomek Mrugalski
1930797c48
[master] Compilation fix after merge (missing })
2015-11-30 13:01:09 +01:00
Tomek Mrugalski
e1cd854c40
[master] Merge branch 'trac3988' (lease{4,6}_recover hooks)
...
# Conflicts:
# src/lib/dhcpsrv/alloc_engine.cc
# src/lib/dhcpsrv/tests/alloc_engine_expiration_unittest.cc
2015-11-30 12:36:46 +01:00
Francis Dupont
99fd9d7036
[master] regen
2015-11-28 10:24:39 +01:00
Francis Dupont
bfed640330
[master] Silence cppcheck error
2015-11-28 10:23:55 +01:00
Francis Dupont
cfaeaf74e4
[master] Regenerated lexer.cc
2015-11-28 08:54:29 +01:00
Francis Dupont
d6eb96ba57
[master] Merged trac4203 (no exit())
2015-11-27 23:31:53 +01:00
Marcin Siodelski
aed3cf4a8c
[master] Added ChangeLog entry for #3874 .
2015-11-26 16:40:12 +01:00
Marcin Siodelski
faf52b069c
[master] Merge branch 'trac3874a'
2015-11-26 16:22:32 +01:00
Marcin Siodelski
49de8971b1
[3874] Fixed compilation issues in DUIDFactory class.
2015-11-26 15:11:18 +01:00
Marcin Siodelski
aab4794b77
[3874] Addressed review comments.
2015-11-26 14:00:06 +01:00
Shawn Routhier
ed4386f639
[master] Update commit number for 4101
...
Also tidy up entry for 4097
2015-11-26 00:21:33 -08:00
Shawn Routhier
3ec88e0669
[master] Merge trac4101 - documentation for classification
...
Add the classify.xml file to document the client classification
system
Update the dhcp4-srv.xml and dhcp6-srv.xml files to provide a brief
description of the classification system and pointers to the
text in classify.xml
2015-11-26 00:15:58 -08:00
Shawn Routhier
9395b48616
[trac4101] Update per second set of review comments
2015-11-26 00:12:13 -08:00
Shawn Routhier
ffb6947184
[trac4101] Move the substring examples into a screen
2015-11-25 12:18:37 -08:00
Shawn Routhier
4f0fc2f43b
[trac4101] Update per review comments
...
Notable items:
Removed a lot of the classification text from dhcp4.xml and dhcp6.xml
leaving a brief description with a pointer to the main text and some
examples.
Added more examples
2015-11-25 12:14:06 -08:00
Stephen Morris
8d87f8f5fa
[4101] Miscellaneous documentation changes during review
2015-11-25 15:43:47 +00:00
Francis Dupont
752ad11ff4
[master] Finished merge trac4097a (Classify and append options)
2015-11-25 14:22:06 +01:00
Francis Dupont
0b33e529c6
[4097a] Added Dhcpv6SrvTest.subnetGlobalPriority
2015-11-25 13:22:04 +01:00
Francis Dupont
eda0988649
[4097a] DHCPDISCOVER typos
2015-11-25 13:18:13 +01:00
Francis Dupont
2de93abcb0
[4097a] Use dhcp4_logger for classification messages
2015-11-25 13:14:56 +01:00
Francis Dupont
8aa346b44d
[4097a] Aligned DHCP6_CLASS_* messages
2015-11-25 13:09:42 +01:00
Francis Dupont
e11158fc1e
[4097a] Added Dhcpv4SrvTest.subnetGlobalPriority
2015-11-25 13:01:24 +01:00
Francis Dupont
52887c0ca1
[4097a] Added check of other options to Dhcp4ParserTest.optionDataDefaultsGlobal
2015-11-25 11:47:01 +01:00
Francis Dupont
525a66ecee
[4097a] Added the CfgOptionList explaination to its declaration
2015-11-25 11:36:04 +01:00
Francis Dupont
c6bced0e1c
[4097a] Added (non-)const comment
2015-11-25 11:32:04 +01:00
Francis Dupont
d40a3b4114
[4097a] Added a no subnet check in buildCfgOptionList()
2015-11-25 11:27:55 +01:00
Shawn Routhier
95fd3715b4
[trac4097] Fix some typos
2015-11-25 00:19:15 -08:00
Shawn Routhier
9a50be7099
[trac4101] Add proposed change log entry
2015-11-23 21:37:58 -08:00
Shawn Routhier
5914d85948
[trac4101] Update v4 and v6 pages
...
Update the v4 and v6 pages to reflect the new classification.
These are shortened versions of the main classification page.
Also update the option description to incude .text and .hex modifiers.
2015-11-23 21:33:29 -08:00
Francis Dupont
c1270cb6ab
[4097a] Addressed not configured class VENDOR_CLASS_*
2015-11-24 01:51:10 +01:00
Francis Dupont
8e1d1e9b4b
[master] Merged trac4201 (distcheck warning)
2015-11-23 22:52:04 +01:00
Francis Dupont
a9ad44b419
[master] Revert only the trac4121 merge
2015-11-23 22:51:10 +01:00
Francis Dupont
2253f5a331
[master] Revert "[master] Added ChangeLog entry 1054 for Trac #4202 "
...
This reverts commit d4acc5160abf9aa521285889a2025d64be02fdc3.
2015-11-23 22:47:59 +01:00
Francis Dupont
173b64b071
[master] Merged trac4121 (distcheck warning)
2015-11-23 22:44:35 +01:00
Thomas Markwalder
d4acc5160a
[master] Added ChangeLog entry 1054 for Trac #4202
2015-11-23 15:24:49 -05:00
Thomas Markwalder
91bf527662
[master] Replaced underscores with hyphens in D2 config and NCRs
...
Merged in branch 'trac4202'
2015-11-23 15:09:28 -05:00
Thomas Markwalder
d9b43805ee
[4202] Addressed review comments
...
Fixed missed underscores in commentary
src/bin/d2/tests/nc_test_utils.h
src/lib/dhcp_ddns/ncr_msg.h
2015-11-23 15:05:16 -05:00
Shawn Routhier
df668f6142
[trac4101] Update per review comments
2015-11-23 11:42:21 -08:00
Thomas Markwalder
430fbc8832
[4202] Replaced underscores with hypens in NCR JSON element names
...
The NCR element names have also been changed to use hyphens. This touched
quita a few unit tests. Files modified:
src/bin/d2/tests/d2_process_unittests.cc
src/bin/d2/tests/d2_queue_mgr_unittests.cc
src/bin/d2/tests/d2_update_mgr_unittests.cc
src/bin/d2/tests/nc_add_unittests.cc
src/bin/d2/tests/nc_remove_unittests.cc
src/bin/d2/tests/nc_test_utils.cc
src/bin/d2/tests/nc_trans_unittests.cc
src/bin/dhcp4/tests/d2_unittest.cc
src/bin/dhcp6/tests/d2_unittest.cc
src/lib/dhcp_ddns/libdhcp_ddns.dox
src/lib/dhcp_ddns/ncr_msg.cc
src/lib/dhcp_ddns/tests/ncr_udp_unittests.cc
src/lib/dhcp_ddns/tests/ncr_unittests.cc
src/lib/dhcpsrv/tests/d2_udp_unittest.cc
2015-11-23 13:22:56 -05:00
Tomek Mrugalski
9b56830ceb
[master] ChangeLog updated.
2015-11-23 18:53:56 +01:00
Tomek Mrugalski
6b0db91610
[master] Merge branch 'trac3990' (User's Guide update for Decline)
2015-11-23 18:37:57 +01:00
Tomek Mrugalski
1195d77278
[3988] Changes after review:
...
- several v4 => v6
- simpler remove_tmp logic
- ExpirationAllocEngine4Test constructor now cleans up hook buffers
2015-11-23 18:33:18 +01:00
Francis Dupont
f397db49d4
[4097a] Optimized the no configured options cases
2015-11-23 15:34:53 +01:00
Francis Dupont
fd12a6d69f
[4097a] Merged #4093
2015-11-23 14:56:49 +01:00
Francis Dupont
0074fbe5a8
[master] Updated option[xxx] in comments
2015-11-23 14:53:43 +01:00
Francis Dupont
a63679993c
[master] Added timestamp to *.hh files
2015-11-23 14:50:46 +01:00
Marcin Siodelski
bcc247cccb
[master] Added ChangeLog entry for #4093 .
2015-11-23 10:26:07 +01:00
Marcin Siodelski
c303175849
[master] Merge branch 'trac4093'
2015-11-23 10:25:13 +01:00
