From 1ac8944294217b48413987bdf7b3eafea3cc3130 Mon Sep 17 00:00:00 2001
From: Sergio Campama <kaipi@google.com>
Date: Fri, 9 Dec 2016 11:26:11 -0500
Subject: Reenable cocoapods objc test and remove unnecessary workaround for
 rvm

---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 7011546e..a34cb83b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,10 +73,6 @@ matrix:
     # we moved to an OS X image that is 10.11.
     - os: osx
       env: CONFIG=python_cpp
-    # This started failing with the OS X 10.12 / Xcode 8.1 image.
-    # https://github.com/google/protobuf/issues/2472
-    - os: osx
-      env: CONFIG=objectivec_cocoapods_integration
     # Mark the iOS test as flakey as xcodebuild some times fails to start the
     # iOS Simulator.
     - os: osx
-- 
cgit v1.2.3