Tomek Mrugalski
65efc0da7f
[3682_rebase] Merge branch 'trac3682' into trac3682_rebase
...
# Conflicts:
# src/lib/dhcpsrv/mysql_lease_mgr.cc
# src/lib/dhcpsrv/mysql_lease_mgr.h
2015-11-30 21:26:25 +01:00
Stephen Morris
fa6d055e18
[master] ChangeLog for trac4208
2015-11-30 19:53:07 +00:00
Stephen Morris
bf6f3d4956
[master] Merge branch 'trac4208'
2015-11-30 19:49:50 +00:00
Marcin Siodelski
4373258d9d
[4211] Added parameter which enables/disables write of a DUID in file.
2015-11-30 18:07:35 +01:00
Tomek Mrugalski
0d4a712074
[master] ChangeLog, AUTHORS updated after github pull request 8
2015-11-30 13:38:02 +01:00
Tomek Mrugalski
fb8a236c85
[github8] Unit-tests written for the query4 parameter.
2015-11-30 13:30:36 +01:00
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
Stephen Morris
29832a42b1
[4208] Update KEA_HOOKS_VERSION to 3 in preparation for release of Kea 1.0.
2015-11-27 17:18:08 +00:00
Francis Dupont
0fed4215ea
[4204fd] Refactored grammar
2015-11-27 16:32:30 +01:00
Francis Dupont
73f048feb5
[4204fd] Reverted to original token.{h,cc}
2015-11-27 16:21:46 +01:00
Francis Dupont
efb9dab922
[4204fd] Remade option_universe_ private
2015-11-27 16:08:49 +01:00
Francis Dupont
1cd419a3d6
[4204fd] Created a convert_option_name method
2015-11-27 15:59:33 +01:00
Francis Dupont
3b33880d14
[4204fd] Regen
2015-11-27 15:46:38 +01:00
Francis Dupont
1666189a61
[4204fd] Moved convert_option_code to context code
2015-11-27 15:45:35 +01:00
Francis Dupont
3f5189fb7b
[4204fd] Handle universe in option code range
2015-11-27 15:15:23 +01:00
Francis Dupont
0182dcff13
[4204fd] Fixed newline handling
2015-11-27 14:30:40 +01:00
Francis Dupont
5759a4dbc5
[4204fd] Added a .bin unit test
2015-11-27 14:11:18 +01:00
Francis Dupont
47a7eae640
[4204fd] Reverted hex->bin change (missed
2015-11-27 13:03:03 +01:00
Francis Dupont
97aaee6e3b
[4204fd] Reverted hex->bin change
2015-11-27 12:52:45 +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
Francis Dupont
c4cd450f03
[4204fd] Applied my proposed changes
2015-11-26 15:20:12 +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
Francis Dupont
83a7bf9094
[4204fd] Merge original trac4204
2015-11-26 13:04:34 +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
Marcin Siodelski
3f53001245
[4204] Remove runtime option defs if "option-def" is not in config.
2015-11-25 16:44:46 +01: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
Marcin Siodelski
e9bcac1d00
[4204] Whitespace may surround option name in expressions.
2015-11-25 11:46:53 +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
Marcin Siodelski
a4b4d1ac83
[4204] Regenerated parser and lexer files after recent changes.
2015-11-25 11:30:15 +01:00
