Skip to content
This repository was archived by the owner on Jan 20, 2025. It is now read-only.

Commit 716cfbe

Browse files
committed
Merge branch '2.6'
Conflicts: pom.xml release-notes/VERSION
2 parents c38acac + 56a7a45 commit 716cfbe

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

release-notes/VERSION

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ Project: jackson-datatype-guava
99
#79: New configuration for Guava Range default bound type.
1010
(contributed by Jonathan R-d-O)
1111

12+
2.6.2 (not yet released)
13+
14+
#80: Relax OSGi version constraints for Guava dependency.
15+
(requested by Benson M)
16+
1217
2.6.1 (09-Aug-2015)
1318

1419
No changes since 2.6.0
@@ -28,11 +33,6 @@ No changes since 2.6.0
2833
#74: Multimap serializer ignores _valueTypeSerializer
2934
(reported by soldierkam@github)
3035

31-
2.5.5 (not yet released)
32-
33-
#80: Relax OSGi version constraints for Guava dependency.
34-
(requested by Benson M)
35-
3636
2.5.4 (09-Jun-2015)
3737

3838
- Add override for `MultimapSerializer.isEmpty(SerializerProvider, Multimap<?,?>)`

0 commit comments

Comments
 (0)