Merge branch 'stable'

Conflicts: .travis.yml
rabbitmq · Dec 17, 2016 · d347c36 · d347c36
2 parents 58862d4 + 2061a26
commit d347c36
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -20,8 +20,9 @@ addons:
       - maven
       - xsltproc
 otp_release:
-  #- "18.3" # Skip Erlang 18.3 because of regressions in SSL.
   - "19.0"
+  - "19.1"
+  - "19.2"
 
 before_script:
   # The checkout made by Travis is a "detached HEAD" and branches