From 3c74c05f423dac3bcf77478dc972c177a950c6e8 Mon Sep 17 00:00:00 2001
From: Joe Rafaniello <jrafanie@redhat.com>
Date: Mon, 26 Mar 2018 11:07:15 -0400
Subject: [PATCH] Update to 2.3.6 on euwe. :sweat_smile:

We previously tried to upgrade to 2.3.6 on euwe by backporting:
https://github.com/ManageIQ/manageiq/pull/15993

This was causing a hang in the automation test suite on euwe and we
reverted it in:
https://github.com/ManageIQ/manageiq/pull/16087

https://bugzilla.redhat.com/show_bug.cgi?id=1560578

The prior 2 commits contain a manual backport of
https://github.com/ManageIQ/manageiq/pull/14239
which solves the 100% cpu hang of the automate ruby method with ruby 2.3.2+.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f5de27ac971..5fcf4fbdff1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-- '2.3.1'
+- '2.3.6'
 sudo: false
 cache:
   bundler: true