From: Francis Dupont <fdupont@isc.org>
Date: Tue, 6 Mar 2018 15:58:46 +0000 (+0100)
Subject: [master] Finishing merge of trac5513 (feed JSON does not handle strings)
X-Git-Tag: ha_checkpoints12~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=231e923a85db7fb8305c7baa4d15f766fdf60942;p=thirdparty%2Fkea.git

[master] Finishing merge of trac5513 (feed JSON does not handle strings)
---

diff --git a/ChangeLog b/ChangeLog
index eaaacff4c6..06cf267a25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1369.	[bug]		fdupont
+	Fixed a bug in JSONfeed tool which did not correctly handle
+	strings and interpret their content.
+	(Trac #5513, git xxx)
+
 1368.	[bug]		tmark
 	Fixed a bug which prevented inserting multiple host reservations
 	where IPv4 address was unspecified or when selected subnet identifier
@@ -5,7 +10,7 @@
 	subnet id columns in both Postgres and MySQL schemas.  Now both
 	schemas support upto MAX UINT32 in all subnet id columns. Exiting
 	databases may be updated without data migration.
-	(Trac 5416, 5522, git d1dd0f2e27ffa49515c17cf68d54f162359b6384)
+	(Trac #5416, #5522, git d1dd0f2e27ffa49515c17cf68d54f162359b6384)
 
 1367.	[bug]		marcin
 	Multiple critical performance optimizations in the allocation