Razvan Becheriu
e409c164a6
added missing tables, columns and values in cql schema, ordered declarations and definitions in lease and host managers
2018-02-13 18:28:40 +02:00
Razvan Becheriu
63ea348578
Merge remote-tracking branch 'isc-kea/master' into cql_lightweight
2018-02-13 09:13:10 +02:00
Francis Dupont
51fd66d364
[master] Finishing merge of trac5494 (Cassandra vs macOS)
2018-02-08 16:02:48 +01:00
Francis Dupont
198716a9a6
[5494] Updated AUTHORS waiting for submitter answer
2018-02-08 15:49:57 +01:00
Francis Dupont
da036437ad
[5494] Added HWADDR_SOURCE_DOCSIS_MODEM
2018-02-08 13:44:58 +01:00
Tomek Mrugalski
ea7c88a1c3
[master] ChangeLog updated after github41 merge.
2018-02-08 04:51:44 +00:00
Tomek Mrugalski
d77fbec5a0
[github41] Initialize logging before reading configuration
...
More precisely, before reading the "Dhcp4" and "Dhcp6" configurations to
log errors thrown because of any configuration loading issues.
# Conflicts:
# src/bin/dhcp4/kea_controller.cc
# src/bin/dhcp6/kea_controller.cc
2018-02-08 04:49:18 +00:00
Tomek Mrugalski
e35fb004fe
Merge branch 'initialize-logging-before-reading-conf' of https://github.com/andreipavelQ/kea into github41
2018-02-08 03:48:30 +00:00
Tomek Mrugalski
fd2263de2b
[master] ChangeLog, AUTHORS updated after github40 merge.
2018-02-06 17:40:43 +00:00
Tomek Mrugalski
318c9e3d3d
[github40] Converted missing backend examples.
2018-02-06 17:17:46 +00:00
Tomek Mrugalski
ed1431b556
[github40] --with-dhcp-XXX renamed to --with-XXX
...
Merge branch 'with-dhcp' of https://github.com/andreipavelQ/kea into github40
# Conflicts:
# doc/guide/install.xml
2018-02-06 17:17:23 +00:00
Tomek Mrugalski
4314a56261
[master] ChangeLog, AUTHORS updated after github #39 merge.
2018-02-06 13:36:22 +00:00
Tomek Mrugalski
9b6705bd6c
[github39] Reverted DocBook 5.0 reference in manpages. They look ok again
2018-02-06 13:29:24 +00:00
Tomek Mrugalski
fde5de6b40
[github39] system_messages tool converted to DocBook 5.0
2018-02-06 13:28:55 +00:00
Tomek Mrugalski
44c782060a
[github39] Merge branch 'docbook-upgrade' of https://github.com/andreipavelQ/kea into github39
...
- improvements required (__VERSION__ macro omitted)
- the patch tried to reverse some texts back to 1.1.0 (we're now at 1.3.0)
- there were many conflicts...
# Conflicts:
# doc/guide/admin.xml
# doc/guide/ctrl-channel.xml
# doc/guide/ddns.xml
# doc/guide/dhcp4-srv.xml
# doc/guide/dhcp6-srv.xml
# doc/guide/install.xml
# doc/guide/intro.xml
# doc/guide/kea-guide.xml
# src/bin/admin/kea-admin.xml
# src/bin/agent/kea-ctrl-agent.xml
# src/bin/d2/kea-dhcp-ddns.xml
# src/bin/dhcp4/kea-dhcp4.xml
# src/bin/dhcp6/kea-dhcp6.xml
# src/bin/keactrl/keactrl.xml
# src/bin/lfc/kea-lfc.xml
# src/bin/perfdhcp/perfdhcp.xml
# src/bin/shell/kea-shell.xml
# src/bin/sockcreator/kea-sockcreator.xml
2018-02-06 12:39:24 +00:00
Razvan Becheriu
662f93ab89
sync with isc kea master
2018-02-01 11:55:04 +02:00
Razvan Becheriu
0962273261
Merge remote-tracking branch 'isc-kea/master'
2018-02-01 11:42:39 +02:00
Tomek Mrugalski
ecf3ea4b49
[master] ChangeLog updated after #5514 merge.
2018-01-31 22:17:03 +01:00
Tomek Mrugalski
6a4aac2b3b
[master] Merge branch 'trac5514' (lw4over6 options reinstantiated)
2018-01-31 14:38:40 +01:00
Tomek Mrugalski
edeeae9d4b
[5514] Change after review:
...
- the opion-space check removed from DHCPv4 similar to DHCPv6
2018-01-31 14:38:11 +01:00
Tomek Mrugalski
65d694f3fe
[master] AUTHORS, ChangeLog updated after github43 merge.
2018-01-31 13:57:11 +01:00
Tomek Mrugalski
1949bb3abf
[master] Merge branch 'github43' (Makefile.am improvements)
2018-01-31 12:56:26 +01:00
Tomek Mrugalski
33b06cb0fd
[github43] Wrapped a line that was too long
2018-01-31 12:55:56 +01:00
Tomek Mrugalski
d3d22fd45e
[master] ChangeLog, AUTHORS updated after github54 merge.
2018-01-30 20:58:40 +01:00
Tomek Mrugalski
7e77f043c9
[master] Merge branch 'github54' (various changes)
2018-01-30 20:55:25 +01:00
Tomek Mrugalski
0f6507c4cb
[github43] Merge branch 'makefile-am' of https://github.com/andreipavelQ/kea into github43
...
# Conflicts:
# Makefile.am
2018-01-30 20:31:11 +01:00
Tomek Mrugalski
2efa749422
[github54] Merge branch 'minor-changes' of https://github.com/andreipavelQ/kea into github54
...
# Conflicts:
# src/bin/admin/admin-utils.sh
# src/lib/cc/data.h
# src/lib/config/module_spec.cc
# src/lib/config/module_spec.h
# src/lib/cryptolink/tests/run_unittests.cc
# src/lib/util/threads/tests/condvar_unittest.cc
2018-01-30 20:19:45 +01:00
Razvan Becheriu
527f970ad5
minor changes
2018-01-30 16:43:16 +02:00
Razvan Becheriu
64870d5626
Merge branch 'master' into HEAD
2018-01-30 16:42:16 +02:00
Tomek Mrugalski
8063474585
[5514] S46 options are now parsed properly
...
- added unit-test for complex S46 options
- fixed support for option spaces other than dhcp6
- added printing of psid
2018-01-30 13:49:34 +01:00
Francis Dupont
38e33d2b59
[master] Updated git hash
2018-01-29 18:44:53 +01:00
Francis Dupont
5f3a89d6e3
[master] Finishing merge of trac5425a (class in pools)
2018-01-29 18:40:34 +01:00
Francis Dupont
3d6bb5b1d4
[master] Merged trac5425a (class in pools)
2018-01-29 18:37:53 +01:00
Francis Dupont
352532410e
[5425a] Reported some changes
2018-01-29 17:38:08 +01:00
Francis Dupont
f85ebcc12d
[5425a] Reverted last 2 commits (unfinished as they include doc fixes)
2018-01-29 17:15:55 +01:00
Tomek Mrugalski
36354d8490
[5425a] Parser regenerated
2018-01-27 00:11:16 +01:00
Tomek Mrugalski
7edd611cb0
[5425a] Changes after review:
...
- it is now possible to define multiple classes for a pool
- small doc corrections
2018-01-27 00:09:33 +01:00
Wlodek Wencel
a767033951
[master] added BOOST_LIBS in Makefiles
2018-01-25 17:38:57 +01:00
Tomek Mrugalski
924b00cb41
[5514] v4 portparameters option definition updated.
2018-01-25 16:42:04 +01:00
Tomek Mrugalski
641bcbadbe
[5514] Revert "[5191] Remove experimental lightweight 4over6 option"
...
This reverts commit 401a5a5207
2018-01-25 15:59:32 +01:00
Tomek Mrugalski
5a6665f20c
[master] AUTHORS, ChangeLog updated after gtihub38 merge.
2018-01-24 13:52:03 +01:00
Tomek Mrugalski
d7e111f104
[github38] Minor tweaks after review.
2018-01-24 13:02:33 +01:00
Tomek Mrugalski
7206aa79c5
Merge branch 'config-h' of https://github.com/andreipavelQ/kea into github38
...
# Conflicts:
# src/lib/config/config_data.cc
# src/lib/config/module_spec.cc
# src/lib/config/tests/config_data_unittests.cc
# src/lib/config/tests/module_spec_unittests.cc
# src/lib/dhcpsrv/cql_connection.cc
# src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
2018-01-24 13:01:56 +01:00
Francis Dupont
2c9454ec56
[5494] Added PR#61 fix
2018-01-21 00:19:50 +01:00
Francis Dupont
d59f7e367d
[master] Updated git hash
2018-01-20 21:21:52 +01:00
Francis Dupont
ff22a90691
[master] Finishing merge of trac5443 (NEXT_STEP_DROP)
2018-01-20 21:20:48 +01:00
Francis Dupont
1ed4f63637
[master] Merged trac5443 (NEXT_STEP_DROP)
2018-01-20 21:18:39 +01:00
Francis Dupont
84d4aad047
[5443] Removed some @todod explaining the DROP status at the first occurrence
2018-01-20 20:51:53 +01:00
Francis Dupont
eb9efffcb0
[5425a] Ported last changes and fixes
2018-01-19 23:53:36 +01:00
Tomek Mrugalski
d847599dd2
[5443] Changes after review (wordsmithing)
2018-01-19 15:21:19 +01:00
