Updated release notes wrt #381

FasterXML · Jan 10, 2014 · 0f7358f · 0f7358f
1 parent d499f2e
commit 0f7358f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/release-notes/CREDITS b/release-notes/CREDITS
@@ -41,7 +41,7 @@ Raymond Myers:
   (2.0.0)
 
 Ryan Gardner:
- * Contributed [pull-5] -- Add support for maps with java.util.Locale keys
+ * Contributed #5 -- Add support for maps with java.util.Locale keys
     to the set of StdKeyDeserializers
   (2.0.1)
 
@@ -54,21 +54,21 @@ Duncan Atkinson:
   (2.1.0)
 
 Mark Wolfe:
- * Suggested [Issue#45]: Add `@JsonNaming()` for per-class naming strategy overrides
+ * Suggested #45: Add `@JsonNaming()` for per-class naming strategy overrides
   (2.1.0)
 
 Dmitry Katsubo:
- * Contributed patch for [Issue#65]: Add getters to `ObjectMapper`, DeserializationContext,
+ * Contributed patch for #65: Add getters to `ObjectMapper`, DeserializationContext,
    DeserializationFactory.
   (2.1.0)
 
 Francis Galiegue:
- * Reported [Issue#93] (and suggested fix): bug in `ObjectMapper.setAll(...)'
+ * Reported #93 (and suggested fix): bug in `ObjectMapper.setAll(...)'
   implementation
   (2.1.1)
 
 kelaneren@github:
- * Reported [Issue#157], contributed unit test: NPE when registering same module twice.
+ * Reported #157, contributed unit test: NPE when registering same module twice.
   (2.1.4)
 
 Eric Tschetter (cheddar@github):
@@ -98,3 +98,7 @@ Seth Pellegrino (jivesoft):
 Florian Schoppmann (fschopp@github)
   * Reported #358: `IterableSerializer` ignoring	annotated content serializer
    (2.3.1)
+
+Matthew Morrissette:
+  * Contributed #381: Allow inlining/unwrapping of value from single-component JSON array
+   (2.4.0)
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -1,6 +1,9 @@
 Project: jackson-databind
 Version: 2.4.0 (xx-xxx-2014)
 
+#381: Allow inlining/unwrapping of value from single-component JSON array
+ (contributed by yinzara@github)
+
 ------------------------------------------------------------------------
 === History: ===
 ------------------------------------------------------------------------

diff --git a/src/main/java/com/fasterxml/jackson/databind/DeserializationFeature.java b/src/main/java/com/fasterxml/jackson/databind/DeserializationFeature.java
@@ -12,6 +12,10 @@
  * In first case these defaults must follow "config-then-use" patterns
  * (i.e. defined once, not changed afterwards); all per-call
  * changes must be done using {@link ObjectReader}.
+ *<p>
+ * Note that features that do not indicate version of inclusion
+ * were available in Jackson 2.0 (or earlier); only later additions
+ * indicate version of inclusion.
  */
 public enum DeserializationFeature implements ConfigFeature
 {
@@ -209,7 +213,9 @@ public enum DeserializationFeature implements ConfigFeature
      * values to the corresponding value type.  This is basically the opposite of the {@link #ACCEPT_SINGLE_VALUE_AS_ARRAY}
      * feature.  If more than one value is found in the array, a JsonMappingException is thrown.
      * <p>
-     * Feature is disabled by default
+     * Feature is disabled by default.
+     * 
+     * @since 2.4
      */
     UNWRAP_SINGLE_VALUE_ARRAYS(false),