commit 3cc3b016a057890d5cf8bea883b6b8dd05534b0c
author Tatu Saloranta <tatu.saloranta@iki.fi> Fri Nov 01 11:17:34 2019 -0700
committer Tatu Saloranta <tatu.saloranta@iki.fi> Fri Nov 01 11:17:34 2019 -0700
tree 82273b3f1a80703dd0cefc888236b641732098fa
parent dfba83d5a0869e2ce6807abb3726e91bf3045064
parent fc4214a883dc087070f25da738ef0d49c2f3387e

Merge branch '2.8' into 2.9

release-notes/VERSION-2.x

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
index 58258a7..36aef4d 100644
--- a/release-notes/VERSION-2.x
+++ b/release-notes/VERSION-2.x
@@ -4,6 +4,11 @@
 === Releases === 
 ------------------------------------------------------------------------
 
+2.9.10.2 (not yet released)
+
+#2526: Block two more gadget types (ehcache/JNDI - CVEs to be allocated)
+  (repoerted by UltramanGaia)
+
 2.9.10.1 (20-Oct-2019)
 
 #2478: Block two more gadget types (commons-dbcp, p6spy,
@@ -33,8 +38,6 @@
   (reported by Fei Lu)
 #2462: Block two more gadget types (commons-configuration)
 #2469: Block one more gadget type (xalan2)
-<<<<<<< HEAD:release-notes/VERSION-2.x
-<<<<<<< HEAD:release-notes/VERSION-2.x
 
 2.9.9 (16-May-2019)