From: Razvan Becheriu <razvan@isc.org>
Date: Wed, 7 Aug 2019 18:13:12 +0000 (+0300)
Subject: [#756, !470] updated Changelog and fixed sphinx docs
X-Git-Tag: Kea-1.6.0~41^2~141
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4d17f3609f6ea9fc621a163cb42a8e3a7d57be5;p=thirdparty%2Fkea.git

[#756, !470] updated Changelog and fixed sphinx docs
---

diff --git a/ChangeLog b/ChangeLog
index 5fb6661b8e..114ed6de5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,15 @@
+1638.	[bug]		franek, razvan
+	Kea statistics improvements: Correct statistic-get{all} commands.
+	(Gitlab #756,!470, git e5f9de794801724528753566fa58af985a0985af)
+
 1637.	[bug]		tmark
 	Corrected an issue in kea-dhcp6 where the server would assign
 	a different lease each time a client with a dynamic host
 	reservation returned via a SOLICIT.
-	(Gitlab #754,!440,	git c548d9330e6f626e538343c5e6361457057efdd7)
+	(Gitlab #754,!440, git c548d9330e6f626e538343c5e6361457057efdd7)
 
 1636.	[bug]		razvan
-	Http request and response parser accepts Content-Length set to 0.
+	Http request and response parser now accepts 0 for Content-Length.
 	(Gitlab #708,!423, git 09d75804e050083b502a96c8e77b0e98c735ae3d)
 
 1635.	[doc]		godfryd, tomek
diff --git a/doc/sphinx/api/statistic-get-all.json b/doc/sphinx/api/statistic-get-all.json
index 98303fe6b8..83690cf70e 100644
--- a/doc/sphinx/api/statistic-get-all.json
+++ b/doc/sphinx/api/statistic-get-all.json
@@ -14,15 +14,15 @@
     ],
     "resp-syntax": [
         "{",
-        "   \"result\": 0",
+        "   \"result\": 0,",
         "   \"arguments\": {",
-        "       \"declined-addresses\": [ [ 0, \"2019-07-30 10:04:28.386733\" ] ]",
-        "       \"reclaimed-declined-addresses\": [ [ 0, \"2019-07-30 10:04:28.386735\" ] ]",
-        "       \"reclaimed-leases\": [ [ 0, \"2019-07-30 10:04:28.386736\" ] ]",
-        "       \"subnet[1].assigned-addresses\": [ [ 0, \"2019-07-30 10:04:28.386740\" ] ]",
-        "       \"subnet[1].declined-addresses\": [ [ 0, \"2019-07-30 10:04:28.386743\" ] ]",
-        "       \"subnet[1].reclaimed-declined-addresses\": [ [ 0, \"2019-07-30 10:04:28.386745\" ] ]",
-        "       \"subnet[1].reclaimed-leases\": [ [ 0, \"2019-07-30 10:04:28.386747\" ] ]",
+        "       \"declined-addresses\": [ [ 0, \"2019-07-30 10:04:28.386733\" ] ],",
+        "       \"reclaimed-declined-addresses\": [ [ 0, \"2019-07-30 10:04:28.386735\" ] ],",
+        "       \"reclaimed-leases\": [ [ 0, \"2019-07-30 10:04:28.386736\" ] ],",
+        "       \"subnet[1].assigned-addresses\": [ [ 0, \"2019-07-30 10:04:28.386740\" ] ],",
+        "       \"subnet[1].declined-addresses\": [ [ 0, \"2019-07-30 10:04:28.386743\" ] ],",
+        "       \"subnet[1].reclaimed-declined-addresses\": [ [ 0, \"2019-07-30 10:04:28.386745\" ] ],",
+        "       \"subnet[1].reclaimed-leases\": [ [ 0, \"2019-07-30 10:04:28.386747\" ] ],",
         "       \"subnet[1].total-addresses\": [ [ 200, \"2019-07-30 10:04:28.386719\" ] ]",
         "       }",
         "}"
diff --git a/doc/sphinx/arm/stats.rst b/doc/sphinx/arm/stats.rst
index 4351ba9f3f..1d0a8f997b 100644
--- a/doc/sphinx/arm/stats.rst
+++ b/doc/sphinx/arm/stats.rst
@@ -214,7 +214,6 @@ An example response returning all collected statistics:
        "reclaimed-leases": [ [ 0, "2019-07-30 10:04:28.386736" ] ], "subnet[1].assigned-addresses": [ [ 0, "2019-07-30 10:04:28.386740" ] ],
        "subnet[1].declined-addresses": [ [ 0, "2019-07-30 10:04:28.386743" ] ], "subnet[1].reclaimed-declined-addresses": [ [ 0, "2019-07-30 10:04:28.386745" ] ],
        "subnet[1].reclaimed-leases": [ [ 0, "2019-07-30 10:04:28.386747" ] ], "subnet[1].total-addresses": [ [ 200, "2019-07-30 10:04:28.386719" ] ]
-
        },
        "result": 0
    }