]>
git.ipfire.org Git - thirdparty/kea.git/log
Marcin Siodelski [Tue, 10 Apr 2018 09:33:32 +0000 (11:33 +0200)]
[5478] Default configuration values documented.
Marcin Siodelski [Tue, 10 Apr 2018 09:02:46 +0000 (11:02 +0200)]
[5478] Described HA specific commands.
Marcin Siodelski [Tue, 10 Apr 2018 07:51:24 +0000 (09:51 +0200)]
[5478] Added User's Guide section with CA configuration for HA.
Marcin Siodelski [Mon, 9 Apr 2018 16:52:09 +0000 (18:52 +0200)]
[5478] Described hot-standby configuration in the User's Guide.
Marcin Siodelski [Mon, 9 Apr 2018 09:53:40 +0000 (11:53 +0200)]
[5478] Load balancing configuration described.
Marcin Siodelski [Thu, 5 Apr 2018 11:30:48 +0000 (13:30 +0200)]
[5478] Initial documentation for the HA hook library.
Thomas Markwalder [Wed, 9 May 2018 15:19:54 +0000 (11:19 -0400)]
[master] MySQL support for shared lease stats implemented
Merge branch 'trac5586'
Thomas Markwalder [Wed, 9 May 2018 13:52:54 +0000 (09:52 -0400)]
[5586] Addressed further review comments
src/bin/admin/tests/dhcpdb_create_5.1.mysql - deleted
src/bin/admin/tests/mysql_tests.sh.in
mysql_upgrade_schema_to_version() - new function which
upgrades an existing schema to a target version
mysql_lease_stat_upgrade_test() - modified to start with
1.0 schema and then use new function to upgrade to 4.0
src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc
mysql_lease_mgr_unittest.cc
Added condition compilation around INVALID_HOST scenario
that causes db connectivity tests to fail
Marcin Siodelski [Wed, 9 May 2018 12:53:33 +0000 (14:53 +0200)]
[master] Added ChangeLog for #5590.
Marcin Siodelski [Wed, 9 May 2018 12:43:21 +0000 (14:43 +0200)]
[master] Merge branch 'trac5590'
Francis Dupont [Wed, 9 May 2018 10:28:17 +0000 (12:28 +0200)]
[master] Merged trac5609 (more DHCPv6 park unit tests)
Thomas Markwalder [Tue, 8 May 2018 19:53:11 +0000 (15:53 -0400)]
[5586] Restored compiled out unit test
src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc
Thomas Markwalder [Tue, 8 May 2018 18:41:40 +0000 (14:41 -0400)]
[5586] Added schema unit tests
src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in
Added SQL statements to populate lease4/6_stat tables
from existing lease table content.
src/bin/admin/tests/dhcpdb_create_5.1.mysql
New file used for upgrade testing
src/bin/admin/tests/mysql_tests.sh.in
run_statement() - new convenience function for running SQL
statements with an optional expected return value
mysql_lease4_stat_test() - verifies lease4_stat
table and trigger operations on a new database
mysql_lease6_stat_test()
mysql_lease6_stat_per_type() - new functions
which lease6_stat table and trigger operations
on a new database
mysql_lease_stat_upgrade_test() - new function
which verifies data migration from an earlier
schema and trigger operation
Marcin Siodelski [Tue, 8 May 2018 11:05:48 +0000 (13:05 +0200)]
[5590] Bumped up library version numbers for beta release.
Marcin Siodelski [Tue, 8 May 2018 09:05:00 +0000 (11:05 +0200)]
[5590] Updated included headers for dhcpsrv library.
Marcin Siodelski [Tue, 8 May 2018 08:58:17 +0000 (10:58 +0200)]
[5590] Updated included headers in hooks library.
Marcin Siodelski [Tue, 8 May 2018 08:56:44 +0000 (10:56 +0200)]
[5590] Updated included headers in http library.
Marcin Siodelski [Tue, 8 May 2018 08:01:16 +0000 (10:01 +0200)]
[5609] Several minor fixes as a result of the review.
- Two clients share server instance in leases6_committed tests.
- Updated some of the test descriptions.
Francis Dupont [Mon, 7 May 2018 16:18:36 +0000 (18:18 +0200)]
[master] Merged trac5605a (RADIUS fixes - selectSubnet4 sanity_only)
Francis Dupont [Mon, 7 May 2018 16:16:05 +0000 (18:16 +0200)]
[5605a] cleanup
Tomek Mrugalski [Mon, 7 May 2018 15:25:17 +0000 (17:25 +0200)]
[5605a] Minor changes after review:
- comments added
Marcin Siodelski [Mon, 7 May 2018 14:13:00 +0000 (16:13 +0200)]
[5586] Corrected some little typos as a result of review.
Francis Dupont [Mon, 7 May 2018 13:08:14 +0000 (15:08 +0200)]
[5609] Added tests
Francis Dupont [Sun, 6 May 2018 08:35:58 +0000 (10:35 +0200)]
[5605a] Made extract DUID false for accounting
Francis Dupont [Wed, 2 May 2018 22:40:51 +0000 (00:40 +0200)]
[5605a] [5608] Fixed example and guide
Tomek Mrugalski [Tue, 1 May 2018 22:40:28 +0000 (23:40 +0100)]
[5605a] Resolved cherry-pick conflicts
Tomek Mrugalski [Tue, 1 May 2018 22:32:59 +0000 (23:32 +0100)]
[5605a] [5608] Added example for sending extra Attributes.
Francis Dupont [Wed, 2 May 2018 20:00:34 +0000 (22:00 +0200)]
[5605a] Added a sanity_only flag to selectSubnet*
Francis Dupont [Wed, 2 May 2018 19:40:12 +0000 (21:40 +0200)]
[5605a] Removed Password attribute for accounting
Thomas Markwalder [Wed, 2 May 2018 17:36:02 +0000 (13:36 -0400)]
[5586] MySQL shared leases stats implemented
src/share/database/scripts/mysql/dhcpdb_create.mysql
src/share/database/scripts/mysql/dhcpdb_drop.mysql
src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in
Added MySQL v4/6 stat tables and triggers
src/lib/dhcpsrv/memfile_lease_mgr.cc
Suppress output of of rows with count values of 0
src/lib/dhcpsrv/mysql_lease_mgr.*
Added v4/v6 lease stat SQL statements
MySqlLeaseStatsQuery
- Added ctor variants that accomodate selection criteria
- Modified start() to handle three variants of selection
MySqlLeaseMgr
- Added start***Query4/6 variants
src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc
Added tests:
- TEST_F(MySqlLeaseMgrTest, leaseStatsQuery4)
- TEST_F(MySqlLeaseMgrTest, leaseStatsQuery6)
Thomas Markwalder [Wed, 2 May 2018 15:17:20 +0000 (11:17 -0400)]
[master] Shared lease stats infrastructure and MemfileLeaseMgr implementation
Merges branch 'trac5585'
Marcin Siodelski [Wed, 2 May 2018 14:21:47 +0000 (16:21 +0200)]
[5585] Minor fixes as a result of the review.
- Adjusted accessors to fit the coding style
- Typos corrected
- Passing objects by reference to avoid cppcheck complaints
Marcin Siodelski [Wed, 2 May 2018 13:17:53 +0000 (15:17 +0200)]
[master] Added ChangeLog entry for #5458.
Marcin Siodelski [Wed, 2 May 2018 12:41:40 +0000 (14:41 +0200)]
[master] Merge branch 'trac5458a'
Francis Dupont [Tue, 1 May 2018 23:48:46 +0000 (01:48 +0200)]
[5605a] Updated to a running config (cf #5605 for other configs)
Francis Dupont [Tue, 1 May 2018 21:20:44 +0000 (23:20 +0200)]
[5605a] Added registeredFactory
Francis Dupont [Tue, 1 May 2018 12:43:39 +0000 (14:43 +0200)]
[5458a] Added solicit with rapid-commit in to be tested comments
Marcin Siodelski [Mon, 30 Apr 2018 15:17:10 +0000 (17:17 +0200)]
[5458] CtrlDhcpv6Srv now passes network_state to dhcp6_srv_configured co.
Thomas Markwalder [Fri, 27 Apr 2018 14:03:33 +0000 (10:03 -0400)]
[master] Added ChangeLog entry 1391 for #5535
Thomas Markwalder [Fri, 27 Apr 2018 14:00:59 +0000 (10:00 -0400)]
[master] kea-dhpc4/6 now support relay ip-addresses
Merges in branch 'trac5535'
Tomek Mrugalski [Fri, 27 Apr 2018 13:24:37 +0000 (14:24 +0100)]
[5535] Minor changes after review:
- improved tests for selectSubnet
- improved hadAddresses
- reinstantiated missing unit-test description
Marcin Siodelski [Fri, 27 Apr 2018 13:02:25 +0000 (15:02 +0200)]
[5458] Removed deleted_leases from ClientContext6.
Also, declined lease is treated as new lease when calling
leases6_committed hook.
Marcin Siodelski [Fri, 27 Apr 2018 11:38:32 +0000 (13:38 +0200)]
[5458] Updated leases6_committed doc to include Rapid Commit case.
Marcin Siodelski [Fri, 27 Apr 2018 11:35:24 +0000 (13:35 +0200)]
[5458] Removed ClientContext6::committed_ flag.
Marcin Siodelski [Fri, 27 Apr 2018 09:52:45 +0000 (11:52 +0200)]
[5458] Eliminated extraneous Pkt6Ptr arguments in calls to processX funcs.
Marcin Siodelski [Fri, 27 Apr 2018 09:25:06 +0000 (11:25 +0200)]
[5458] Added a comment for processDhcpv4Query that it doesn't throw.
Marcin Siodelski [Fri, 27 Apr 2018 09:20:36 +0000 (11:20 +0200)]
[5458] Make sanityCheck call compacted.
Marcin Siodelski [Fri, 27 Apr 2018 09:06:23 +0000 (11:06 +0200)]
[5458] Dhcp6Hooks declaration is back in anonymous namespace.
Marcin Siodelski [Fri, 27 Apr 2018 09:02:19 +0000 (11:02 +0200)]
[5458] Eliminated new unit test failure due to issues with DUID file access
Tomek Mrugalski [Fri, 27 Apr 2018 06:23:52 +0000 (07:23 +0100)]
[master] ChangeLog updated.
Tomek Mrugalski [Fri, 27 Apr 2018 06:19:05 +0000 (07:19 +0100)]
[5538] User's guide corrections, makefile extended
Tomek Mrugalski [Fri, 27 Apr 2018 06:15:52 +0000 (07:15 +0100)]
[5538] Example config updated.
Tomek Mrugalski [Fri, 27 Apr 2018 06:15:16 +0000 (07:15 +0100)]
[5538] Radius example comments updated.
Francis Dupont [Thu, 26 Apr 2018 23:13:12 +0000 (01:13 +0200)]
[5538] Added secrets
Francis Dupont [Thu, 26 Apr 2018 22:54:11 +0000 (00:54 +0200)]
[5538] Merge branch 'trac5538' of ssh://git.kea.isc.org/git/kea into trac5538
Francis Dupont [Thu, 26 Apr 2018 22:53:17 +0000 (00:53 +0200)]
[5538] Added radius.json tentative RADIUS config
Tomek Mrugalski [Thu, 26 Apr 2018 21:58:06 +0000 (22:58 +0100)]
[5538] The hosts-databases entries are not needed.
Tomek Mrugalski [Thu, 26 Apr 2018 21:22:59 +0000 (22:22 +0100)]
[5538] Radius docs updated and corrected.
Tomek Mrugalski [Thu, 26 Apr 2018 21:22:24 +0000 (22:22 +0100)]
[5538] host-cache documentation written
Thomas Markwalder [Thu, 26 Apr 2018 19:13:53 +0000 (15:13 -0400)]
[5535] RelayInfo parser emits ip-address deprecation message
Tomek Mrugalski [Thu, 26 Apr 2018 19:11:22 +0000 (20:11 +0100)]
[5538] RADIUS hook documentation added.
Thomas Markwalder [Thu, 26 Apr 2018 18:42:38 +0000 (14:42 -0400)]
[5535] Updated admin guide
Thomas Markwalder [Thu, 26 Apr 2018 18:24:46 +0000 (14:24 -0400)]
[5535] kea-dhcp6 parsing now supports relay "ip-addresses"
src/bin/dhcp6/dhcp6_lexer.ll
src/bin/dhcp6/dhcp6_parser.yy
Modified to support "ip-address" and
"ip-addresses" under "relay"
src/bin/dhcp6/tests/get_config_unittest.cc
Updated per process.
src/bin/dhcp6/tests/config_parser_unittest.cc
void checkResult() - modified to output parsing error text
TEST_F(Dhcp6ParserTest, subnetRelayInfo)
TEST_F(Dhcp6ParserTest, sharedNetworksDerive)
- updated to use new Network methods
TEST_F(Dhcp6ParserTest, subnetRelayInfoList) - new test
to verify a list of addresses in relay
Thomas Markwalder [Thu, 26 Apr 2018 17:54:45 +0000 (13:54 -0400)]
[5535] kea-dhcp4 parsing now supports relay "ip-addresses"
src/bin/dhcp4/dhcp4_lexer.ll
src/bin/dhcp4/dhcp4_parser.yy
Modified to support "ip-address" and
"ip-addresses" under "relay"
src/bin/dhcp4/tests/get_config_unittest.cc
Updated per process.
src/bin/dhcp4/tests/config_parser_unittest.cc
void checkResult() - modified to output parsing error text
TEST_F(Dhcp4ParserTest, subnetRelayInfo)
TEST_F(Dhcp4ParserTest, classifySubnets)
- updated to use new Network methods
TEST_F(Dhcp4ParserTest, subnetRelayInfoList) - new test
to verify a list of addresses in relay
Thomas Markwalder [Thu, 26 Apr 2018 17:20:39 +0000 (13:20 -0400)]
[5535] RelayInfo parsing handles both ip-address and ip-addresses
src/lib/dhcpsrv/parsers/dhcp_parsers.*
RelayInfoParser::parse() - reworked to support either
ip-address or ip-addresses
RelayInfoParser::addAddress() - new parser helper method
src/lib/dhcpsrv/parsers/shared_network_parser.cc
SharedNetwork4Parser::parse()
SharedNetwork6Parser::parse()
- both now parse "relay" element (was missing)
src/lib/dhcpsrv/tests/shared_network_parser_unittest.cc
Modified to support testing "relay" element parsing
Added new tests:
TEST_F(SharedNetwork4ParserTest, relayInfoTests)
TEST_F(SharedNetwork6ParserTest, relayInfoTests)
Francis Dupont [Thu, 26 Apr 2018 14:48:02 +0000 (16:48 +0200)]
[5458a] Merge branch 'trac5458a' of ssh://git.kea.isc.org/git/kea into trac5458a
Francis Dupont [Thu, 26 Apr 2018 14:47:05 +0000 (16:47 +0200)]
[5458a] Improved tests (with the plan for next steps)
Thomas Markwalder [Wed, 25 Apr 2018 18:47:21 +0000 (14:47 -0400)]
[5535] dhcpsrv now supports multiple relay addresses in RelayInfo
src/lib/dhcpsrv/network.*
Network::RelayInfo
- modified to support a list of IP addresses
- added methods:
addAddress(const asiolink::IOAddress& addr)
bool hasAddresses()
bool containsAddress(const asiolink::IOAddress& addr)
+const IOAddressList& getAddresses()
Network
- added wrapper methods for convenience:
addRelayAddress(const asiolink::IOAddress& addr)
bool hasRelays()
bool hasRelayAddress(const asiolink::IOAddress& addr)
const IOAddressList& getRelayAddresses()
- toElement() - modified to output ip-addresses list
Updated the following accordingly:
src/lib/dhcpsrv/cfg_subnets4.cc
src/lib/dhcpsrv/cfg_subnets6.cc
src/lib/dhcpsrv/parsers/dhcp_parsers.cc
src/lib/dhcpsrv/subnet.cc
src/lib/dhcpsrv/tests/cfg_shared_networks4_unittest.cc
src/lib/dhcpsrv/tests/cfg_shared_networks6_unittest.cc
src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc
src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc
src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
src/lib/dhcpsrv/tests/shared_network_unittest.cc
src/lib/dhcpsrv/tests/subnet_unittest.cc
Francis Dupont [Wed, 25 Apr 2018 18:35:08 +0000 (20:35 +0200)]
[master] Updated git hash
Francis Dupont [Wed, 25 Apr 2018 18:34:16 +0000 (20:34 +0200)]
[master] Merged trac5530a doc
Francis Dupont [Wed, 25 Apr 2018 18:32:39 +0000 (20:32 +0200)]
[master] Finished merge of trac5530a (Radius accounting / dhcp6 srv configured)
Francis Dupont [Wed, 25 Apr 2018 18:29:33 +0000 (20:29 +0200)]
[master] Merged trac5530a (Radius accounting / dhcp6 srv configured
Marcin Siodelski [Wed, 25 Apr 2018 17:46:42 +0000 (19:46 +0200)]
[5458] Corrections in the descriptions of new DHCPv6 server callouts.
Francis Dupont [Wed, 25 Apr 2018 04:14:22 +0000 (06:14 +0200)]
[5458a] Checkpoint: code and main tests done, todo prefix and all v6 corner cases
Tomek Mrugalski [Wed, 25 Apr 2018 00:59:39 +0000 (01:59 +0100)]
[5530a] Documentation for dhcp6_srv_configured added.
Francis Dupont [Mon, 23 Apr 2018 15:09:08 +0000 (17:09 +0200)]
[5458a] Checkpoint: working on tests
Thomas Markwalder [Mon, 23 Apr 2018 14:08:27 +0000 (10:08 -0400)]
[master] Added ChangeLog entry 1388 for #5567
Thomas Markwalder [Mon, 23 Apr 2018 14:06:38 +0000 (10:06 -0400)]
[master] Add backward compatible support for --with-dhcp-<mysql/pgsql>
Merges in branch 'trac5567'
Thomas Markwalder [Mon, 23 Apr 2018 13:41:52 +0000 (09:41 -0400)]
[master] Added ChangeLog entry 1387 for #5115.
Thomas Markwalder [Mon, 23 Apr 2018 13:39:20 +0000 (09:39 -0400)]
[master] Remove unecessary -r command line constraints from perfdhcp
Merges in branch 'trac5115'
Tomek Mrugalski [Mon, 23 Apr 2018 10:22:07 +0000 (11:22 +0100)]
[5567] --with-pgsql,--with-mysql are now more robust
Francis Dupont [Thu, 19 Apr 2018 23:09:31 +0000 (01:09 +0200)]
[5458a] Code done, tests to do
Francis Dupont [Wed, 18 Apr 2018 21:12:27 +0000 (23:12 +0200)]
[master] Removed unused parameters (warnings)
Francis Dupont [Wed, 18 Apr 2018 16:12:19 +0000 (18:12 +0200)]
[master] Removed unused defs
Francis Dupont [Thu, 12 Apr 2018 14:07:47 +0000 (16:07 +0200)]
[5458a] Checkpoint (dhcp6 to finish - lib to do)
Thomas Markwalder [Thu, 12 Apr 2018 13:57:44 +0000 (09:57 -0400)]
[5585] v6 Memfile support complete
src/lib/dhcpsrv/memfile_lease_mgr.*
Added:
- MemfileLeaseStatsQuery6(Lease6Storage& storage6, const SubnetID& subnet_id)
- MemfileLeaseStatsQuery6(Lease6Storage& storage6, const SubnetID& first_subnet_id,
const SubnetID& last_subnet_id)
- Memfile_LeaseMgr::startSubnetLeaseStatsQuery6()
- Memfile_LeaseMgr::startSubnetRangeLeaseStatsQuery6()
MemfileLeaseStatsQuery6()::start() - modified to set lower/upper bounds based
on select mode
src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.*
GenericLeaseMgrTest::testLeaseStatsQuery6() - new test to check v6 variants
src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
TEST_F(MemfileLeaseMgrTest, leaseStatsQuery6)
Thomas Markwalder [Thu, 12 Apr 2018 11:35:47 +0000 (07:35 -0400)]
[5585] v4 Memfile support complete
Changed subnetID parms to const refs
src/lib/dhcpsrv/memfile_lease_mgr.*
Added constructors:
- MemfileLeaseStatsQuery(const SubnetID& subnet_id)
- MemfileLeaseStatsQuery(const SubnetID& first_subnet_id,
const SubnetID& last_subnet_id)
- MemfileLeaseStatsQuery4(Lease4Storage& storage4, const SubnetID& subnet_id)
- MemfileLeaseStatsQuery4(Lease4Storage& storage4, const SubnetID& first_subnet_id,
const SubnetID& last_subnet_id)
MemfileLeaseStatsQuery4::start() - altered to set lower/upper iterators
based on select mode
Memfile_LeaseMgr::startSubnetLeaseStatsQuery4(const SubnetID& subnet_id)
Memfile_LeaseMgr::startSubnetRangeLeaseStatsQuery4(const SubnetID& first_subnet_id,
const SubnetID& last_subnet_id)
src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc
GenericLeaseMgrTest::testLeaseStatsQuery4() - expanded to cover bad values
Francis Dupont [Thu, 12 Apr 2018 10:32:51 +0000 (12:32 +0200)]
[master] Updated git hash
Francis Dupont [Thu, 12 Apr 2018 10:31:27 +0000 (12:31 +0200)]
[master] Finishing merge of trac5495 (comment/user-context for d2 and ca)
Francis Dupont [Thu, 12 Apr 2018 10:23:34 +0000 (12:23 +0200)]
[5458a] Reported dhcp6 srv configured patch from Radius
Marcin Siodelski [Thu, 12 Apr 2018 10:15:29 +0000 (12:15 +0200)]
[master] Fixed dependency on libkea-eval in lfc and lease_cmds.
Francis Dupont [Thu, 12 Apr 2018 09:14:01 +0000 (11:14 +0200)]
[master] Removed const for an iterator used in erase
Tomek Mrugalski [Wed, 11 Apr 2018 21:12:00 +0000 (23:12 +0200)]
[master] ChangeLog, docs updated after 5543 merge.
Tomek Mrugalski [Wed, 11 Apr 2018 21:05:46 +0000 (23:05 +0200)]
[master] Merge branch 'trac5543' (leaseX-wipe for all subnets)
Tomek Mrugalski [Wed, 11 Apr 2018 21:04:15 +0000 (23:04 +0200)]
[5543] Changes after review
Francis Dupont [Wed, 11 Apr 2018 19:20:08 +0000 (21:20 +0200)]
[master] Final changes from 5374 merge
Thomas Markwalder [Wed, 11 Apr 2018 18:56:44 +0000 (14:56 -0400)]
[5585] Initial LeaseQueryStats, LeaseMgr, and MemfileLeaseMgr extensions
MemfileLeaseMgr unit tests fail for subnet and range query variants, not yet
implemented
src/lib/dhcpsrv/lease_mgr.*
LeaseStatsQuery
- Added SelectMode enum typedef
- Added instance members: first_subnet_id_, last_subnet_id_, and select_mode_
- Added constructors for single subnet and subnet range queries
LeaseMgr
Added virtual start query variants:
- startSubnetLeaseStatsQuery4(SubnetID subnet_id);
- startSubnetRangeLeaseStatsQuery4(SubnetID first, SubnetID last);
- startSubnetLeaseStatsQuery6(SubnetID subnet_id);
- startSubnetRangeLeaseStatsQuery6(SubnetID first, SubnetID last);
src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.*
GenericLeaseMgrTest
- Added checkQueryAgainstRowSet()
- Added testLeaseStatsQuery4()
src/lib/dhcpsrv/tests/lease_mgr_unittest.cc
Added LeaseStatsQuery ctor tests
- TEST (LeaseStatsQueryTest, defaultCtor)
- TEST (LeaseStatsQueryTest, singleSubnetCtor)
- TEST (LeaseStatsQueryTest, subnetRangeCtor)
src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
TEST_F(MemfileLeaseMgrTest, leaseStatsQuery4) {
Francis Dupont [Wed, 11 Apr 2018 15:40:52 +0000 (17:40 +0200)]
[master] Fixed merge error
Francis Dupont [Wed, 11 Apr 2018 15:35:03 +0000 (15:35 +0000)]
[master] regen flex/bison
Francis Dupont [Wed, 11 Apr 2018 15:34:08 +0000 (17:34 +0200)]
[master] Fixed merge error