Merge branch '2.9' into 2.10

cowtowncoder · cowtowncoder · commit d17eb5c57200 · 2018-08-31T13:34:50.000-07:00
diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -26,3 +26,9 @@ Thomas Hauk (thauk-copperleaf@github)
 * Contibuted #84 (yaml): Add option to allow use of platform-linefeed
   (`YAMLGenerator.Feature.USE_PLATFORM_LINE_BREAKS`)
  (2.9.6)
+
+Yegor Borovikov (yborovikov@gitub)
+
+* Reported #81 (yaml): Jackson 2.9.5, 2.9.6 incompatible with snakeyaml 1.20, 1.21
+ (2.9.7)
+
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -8,6 +8,11 @@ Modules:
 === Releases ===
 ------------------------------------------------------------------------
 
+2.9.7 (not yet released)
+
+#81: Jackson 2.9.5, 2.9.6 incompatible with snakeyaml 1.20, 1.21
+ (reported by Yegor B)
+
 2.9.6 (12-Jun-2018)
 
 #84 (yaml): Add option to allow use of platform-linefeed
