diff options
| author | Tomek Mrugalski <tomasz@isc.org> | 2017-02-10 18:47:03 +0100 |
|---|---|---|
| committer | Tomek Mrugalski <tomasz@isc.org> | 2017-02-10 18:47:03 +0100 |
| commit | 27956d95a36faf8d2b9f1ea68ac4d8466e0768a5 (patch) | |
| tree | 7249b3f654516e53eb0f4cc37028fed6d4c7600f /src/bin/perfdhcp/tests/perf_pkt6_unittest.cc | |
| parent | ChangeLog, AUTHORS update after Github #42 merge. (diff) | |
| parent | Fixed a bad spelling mistake change (diff) | |
| download | kea-27956d95a36faf8d2b9f1ea68ac4d8466e0768a5.tar.xz kea-27956d95a36faf8d2b9f1ea68ac4d8466e0768a5.zip | |
[master] Merge branch github47 (typos)
# Conflicts:
# src/bin/dhcp4/json_config_parser.cc
# src/bin/dhcp4/tests/fqdn_unittest.cc
# src/bin/dhcp6/dhcp6_srv.h
# src/bin/dhcp6/tests/fqdn_unittest.cc
# src/lib/config/command_mgr.h
# src/lib/dhcpsrv/alloc_engine.h
# src/lib/dhcpsrv/parsers/client_class_def_parser.h
# src/lib/dhcpsrv/parsers/dbaccess_parser.cc
# src/lib/dhcpsrv/parsers/dhcp_parsers.cc
# src/lib/dhcpsrv/parsers/dhcp_parsers.h
# src/lib/dhcpsrv/srv_config.h
# src/lib/dhcpsrv/tests/client_class_def_parser_unittest.cc
# src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
# src/lib/eval/eval_context.h
# src/lib/hooks/callout_manager.cc
# src/lib/testutils/dhcp_test_lib.sh.in
Diffstat (limited to 'src/bin/perfdhcp/tests/perf_pkt6_unittest.cc')
| -rw-r--r-- | src/bin/perfdhcp/tests/perf_pkt6_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bin/perfdhcp/tests/perf_pkt6_unittest.cc b/src/bin/perfdhcp/tests/perf_pkt6_unittest.cc index 15d073f6fc..920738df89 100644 --- a/src/bin/perfdhcp/tests/perf_pkt6_unittest.cc +++ b/src/bin/perfdhcp/tests/perf_pkt6_unittest.cc @@ -217,7 +217,7 @@ TEST_F(PerfPkt6Test, InvalidOptions) { // Create packet. boost::scoped_ptr<PerfPkt6> pkt2(capture()); - // Testing offset of the option (lower than pakcet size but + // Testing offset of the option (lower than packet size but // tail of the option out of bounds). LocalizedOptionPtr pkt2_serverid(new LocalizedOption(Option::V6, D6O_SERVERID, |