Merge remote-tracking branch 'origin/4.11' into 4.12

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2019-07-04 15:32:01 +05:30 · 2019-07-04 15:32:01 +05:30 · 47f5c656ac
parent f0d7942162 35b914570d
commit 47f5c656ac
1 changed files with 2 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -15,12 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 sudo: required
-dist: trusty
+dist: xenial
 group: edge

 language: java
 jdk:
-  - oraclejdk8
+  - openjdk8
 python:
  - "2.7"