From 0a3cfdb11edd9eb686e975e87653c4eedabdc67b Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Mon, 15 Jun 2020 16:13:07 +0200 Subject: [PATCH] [#1100] Addressed comments before rebase --- doc/sphinx/arm/config.rst | 2 +- doc/sphinx/arm/hooks.rst | 2 +- src/bin/agent/tests/testdata/get_config.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/sphinx/arm/config.rst b/doc/sphinx/arm/config.rst index 762e4f66c5..892e7b67c3 100644 --- a/doc/sphinx/arm/config.rst +++ b/doc/sphinx/arm/config.rst @@ -178,7 +178,7 @@ the older mechanisms and we hope to deprecate JSON comments one day in the future. To promote this way of storing comments, Kea code is able to understand JSON comments, but converts them to user context on the fly. The comments entries in user-context were converted back to JSON comments to -keep backward compatibility, but that conversion went away in version 1.7.x. +keep backward compatibility, but that conversion went away in version 1.7.9. The is one side effect, however. If your configuration uses the old JSON comment, the `config-get` command will return a slightly modified diff --git a/doc/sphinx/arm/hooks.rst b/doc/sphinx/arm/hooks.rst index 1ab531af58..1f56e7252c 100644 --- a/doc/sphinx/arm/hooks.rst +++ b/doc/sphinx/arm/hooks.rst @@ -2839,7 +2839,7 @@ operations, for example. If user context is supported in a given context, the parser translates "comment" entries into user context with a "comment" entry. The pretty print of a configuration did the opposite operation and put "comment" -entries at the beginning of maps, but this was withdrawn in 1.7.x. +entries at the beginning of maps, but this was withdrawn in 1.7.9. As of Kea 1.3, the structures that allow user contexts are pools of all types (addresses and prefixes) and subnets. Kea 1.4 extended user diff --git a/src/bin/agent/tests/testdata/get_config.json b/src/bin/agent/tests/testdata/get_config.json index e1de227316..725b84337a 100644 --- a/src/bin/agent/tests/testdata/get_config.json +++ b/src/bin/agent/tests/testdata/get_config.json @@ -22,7 +22,7 @@ }, "hooks-libraries": [ { - "library": "/tmp/k1100/src/bin/agent/tests/.libs/libbasic.so", + "library": "/opt/local/control-agent-commands.so", "parameters": { "param1": "foo" }