Merge branch '2.8' into 2.9
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)