From 577499264292598f18e4b1775249f3bb20b1effc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 18 Sep 2014 12:43:18 +0200 Subject: [PATCH] Fix bundler killer patch. --- rocci-server-unbundle.diff | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/rocci-server-unbundle.diff b/rocci-server-unbundle.diff index f4ca918..8d4000d 100644 --- a/rocci-server-unbundle.diff +++ b/rocci-server-unbundle.diff @@ -1,4 +1,3 @@ -commit 6472c939703f3a9a64c669a2fd826ad2a98e8bdd Author: František Dvořák Date: Thu Sep 18 00:47:31 2014 +0200 @@ -18,7 +17,7 @@ index 98480fb..268b1ca 100644 +require 'rails' +require 'rails-api' +require 'jbuilder' -+require 'rack-cors' ++require 'rack/cors' +require 'passenger' +require 'dalli' +require 'kgio' @@ -30,14 +29,14 @@ index 98480fb..268b1ca 100644 +# ec2 backend +begin + require 'aws-sdk-core' -+rescue ++rescue LoadError +end +# opennebula backend +begin + require 'opennebula' + require 'erubis' + require 'ox' -+rescue ++rescue LoadError +end # Extend Object with #deep_freeze -- 1.8.2.3