From: Francis Dupont <fdupont@isc.org>
Date: Fri, 6 Oct 2017 16:16:00 +0000 (+0200)
Subject: [master] Finished merge of trac5363 (ifelse)
X-Git-Tag: trac5381_base~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e1136eb26e4c0688fb659581590639da290f934;p=thirdparty%2Fkea.git

[master] Finished merge of trac5363 (ifelse)
---

diff --git a/ChangeLog b/ChangeLog
index 0d2674ca76..a073b9e397 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1308.	[func]		fdupont
+	Support for conditional token ifelse(condition, iftrue, iffalse)
+	was added. It can be used in flex-id, client classification and
+	possibly other expressions that may appear in the future.
+	(Trac #5363, git xxx)
+
 1307.	[func]		fdupont
 	When an option is defined with a record type and the array
 	flag is true the last record field is an array. All standard