From: Thomas Markwalder <tmark@isc.org>
Date: Wed, 16 May 2018 13:41:58 +0000 (-0400)
Subject: [master] Added new Stat Cmds hooks lib to open source repo
X-Git-Tag: trac5549a_base~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36f20f1c8b28f629fe2896b817ac0f3c6026fe0e;p=thirdparty%2Fkea.git

[master] Added new Stat Cmds hooks lib to open source repo

    Merge branch 'trac5589'
---

36f20f1c8b28f629fe2896b817ac0f3c6026fe0e
diff --cc doc/guide/Makefile.am
index 8383ca2c90,f87666ded8..1cb54cc6fc
--- a/doc/guide/Makefile.am
+++ b/doc/guide/Makefile.am
@@@ -7,9 -7,9 +7,9 @@@ dist_html_DATA = $(HTMLDOCS) kea-guide.
  
  DOCBOOK = kea-guide.xml intro.xml quickstart.xml install.xml admin.xml config.xml
  DOCBOOK += keactrl.xml dhcp4-srv.xml dhcp6-srv.xml lease-expiration.xml logging.xml
 -DOCBOOK += ddns.xml hooks.xml libdhcp.xml lfc.xml stats.xml ctrl-channel.xml faq.xml
 -DOCBOOK += hooks-host-cache.xml hooks-radius.xml hooks-stat-cmds.xml
 -DOCBOOK += classify.xml shell.xml agent.xml
 +DOCBOOK += ddns.xml hooks.xml hooks-ha.xml hooks-host-cache.xml hooks-radius.xml
- DOCBOOK += libdhcp.xml lfc.xml stats.xml ctrl-channel.xml faq.xml classify.xml
- DOCBOOK += shell.xml agent.xml
++DOCBOOK += hooks-stat-cmds.xml libdhcp.xml lfc.xml stats.xml ctrl-channel.xml 
++DOCBOOK += faq.xml classify.xml shell.xml agent.xml
  
  EXTRA_DIST = $(DOCBOOK)
  
diff --cc doc/guide/hooks.xml
index 7b768fae3c,14993fea91..555035d166
--- a/doc/guide/hooks.xml
+++ b/doc/guide/hooks.xml
@@@ -2858,8 -2838,12 +2858,10 @@@ both the command and the response
  
      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hooks-host-cache.xml"/>
  
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hooks-stat-cmds.xml"/>
+ 
    </section>
  
 -
 -
      <section xml:id="user-context">
        <title>User contexts</title>
        <para>Hook libraries can have their own configuration parameters. That is