commit 5df1a6c3bd4f1594b945ea6fda70fe43e87e5e29
author Tatu Saloranta <tatu.saloranta@iki.fi> Fri Dec 11 17:13:59 2015 -0800
committer Tatu Saloranta <tatu.saloranta@iki.fi> Fri Dec 11 17:13:59 2015 -0800
tree 0a2a249fc0eb21525b0fc0cbdc5985552494a568
parent f2b0ac522d198378768b0f2b9491e08a54d3cd1d

Fix #1044

release-notes/VERSION

diff --git a/release-notes/VERSION b/release-notes/VERSION
index df87f99..807a962 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -52,6 +52,8 @@
  (suggested by David B)
 #1043: @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY) does not work on fields
  (reported by fabiolaa@github)
+#1044: Add `AnnotationIntrospector.resolveSetterConflict(...)` to allow custom setter conflict resolution
+ (suggested by clydebarrow@github)
 - Make `JsonValueFormat` (self-)serializable, deserializable, to/from valid external
   value (as per JSON Schema spec)