aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTatu Saloranta <tatu.saloranta@iki.fi>2020-07-20 18:47:01 -0700
committerTatu Saloranta <tatu.saloranta@iki.fi>2020-07-20 18:47:01 -0700
commit2baa845ce0b76811341381fc5460a05a70f5998b (patch)
tree408d4d28707e57827fc984e42787ea413b5ba002
parentfc4269d3b7ce712b865bdd85294ae08ab428c371 (diff)
parentba193736bfc2cd92245bc0961c31ec12027767c3 (diff)
downloadjackson-core-2baa845ce0b76811341381fc5460a05a70f5998b.tar.gz
Merge branch '2.10' into 2.11
-rw-r--r--release-notes/VERSION-2.x4
1 files changed, 3 insertions, 1 deletions
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
index 3cb0e38c..54802d2c 100644
--- a/release-notes/VERSION-2.x
+++ b/release-notes/VERSION-2.x
@@ -14,6 +14,8 @@ JSON library.
=== Releases ===
------------------------------------------------------------------------
+2.12.0 (not yet released)
+
2.11.1 (25-Jun-2020)
No changes since 2.11.0
@@ -32,7 +34,7 @@ No changes since 2.11.0
#611: Optionally allow leading decimal in float tokens
(contributed by James A)
-2.10.5 (not yet released)
+2.10.5 (21-Jul-2020)
#616: Parsing JSON with `ALLOW_MISSING_VALUE` enabled results in endless stream
of `VALUE_NULL` tokens