Merge remote-tracking branch 'origin/master' into 2.3.0

2017-03-23 20:50:26 +08:00 · 2017-03-23 20:50:26 +08:00 · 7209731e45
commit 7209731e45
parent d4336bd294 98d55ba7cd
1 changed files with 2 additions and 1 deletions
--- a/shippable.yml
+++ b/shippable.yml
@ -2,7 +2,8 @@ language: java

 jdk:
 - oraclejdk8
- openjdk7
+# no need to test jdk7 as smoke test is already covered by travis-ci
+#- openjdk7

 build:
  cache: true