Merge branch '2.9' into 2.10

cowtowncoder · cowtowncoder · commit 436a31335d7a · 2019-11-25T19:14:19.000-08:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: java
 
 jdk:
-  - openjdk7
   - openjdk8
 
 # whitelist
diff --git a/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java b/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java
@@ -124,7 +124,7 @@ public enum Feature
          * not exposed as part of the token stream.
          *<p>
          * Note that this feature is only considered if
-         * {@link #INSERT_NULLS_FOR_MISSING_COLUMNS}
+         * {@link #FAIL_ON_MISSING_COLUMNS}
          * is disabled.
          *<p>
          * Feature is disabled by default.
