From: bert hubert <bert.hubert@netherlabs.nl>
Date: Sat, 5 Dec 2015 19:54:43 +0000 (+0100)
Subject: resolve conflict, add reporting of acl/locals
X-Git-Tag: dnsdist-1.0.0-alpha1~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7995e9dbfa46099656707b66acde9c6d4f18ca22;p=thirdparty%2Fpdns.git

resolve conflict, add reporting of acl/locals
---

diff --git a/pdns/dnsdistdist/html/index.html b/pdns/dnsdistdist/html/index.html
index fa8cf02e23..1350444205 100644
--- a/pdns/dnsdistdist/html/index.html
+++ b/pdns/dnsdistdist/html/index.html
@@ -56,6 +56,7 @@
     <p>
       Uptime: <span id="uptime"></span>, Number of queries: <span id="questions"></span> (<span id="qps"></span> qps), ACL drops: <span id="acl-drops"></span><br/>
       Average response time: <span id="latency"></span> ms, CPU Usage: <span id="cpu"></span>%, Server selection policy: <span id="server-policy"></span><br/>
+      Listening on: <span id="local"></span>, ACL: <span id="acl"></span>      
     </p>
     <table width="100%" cellpadding="20">
       <tr valign="top">