Return-Path: X-Original-To: apmail-deltacloud-dev-archive@www.apache.org Delivered-To: apmail-deltacloud-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EC176D8B6 for ; Fri, 30 Nov 2012 10:28:19 +0000 (UTC) Received: (qmail 53217 invoked by uid 500); 30 Nov 2012 10:28:19 -0000 Delivered-To: apmail-deltacloud-dev-archive@deltacloud.apache.org Received: (qmail 53199 invoked by uid 500); 30 Nov 2012 10:28:19 -0000 Mailing-List: contact dev-help@deltacloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltacloud.apache.org Delivered-To: mailing list dev@deltacloud.apache.org Received: (qmail 53185 invoked by uid 99); 30 Nov 2012 10:28:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Nov 2012 10:28:19 +0000 X-ASF-Spam-Status: No, hits=-5.0 required=5.0 tests=RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of mfojtik@redhat.com designates 209.132.183.28 as permitted sender) Received: from [209.132.183.28] (HELO mx1.redhat.com) (209.132.183.28) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Nov 2012 10:28:12 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAUARoYm000956 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 30 Nov 2012 05:27:50 -0500 Received: from boosh.local.com (vpn1-7-27.ams2.redhat.com [10.36.7.27]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qAU9oMnV022155 for ; Fri, 30 Nov 2012 04:50:25 -0500 From: mfojtik@redhat.com To: dev@deltacloud.apache.org Subject: [PATCH core 2/3] Tests: Do not explicitely require 'require_relative' on MRI 1.9 Date: Fri, 30 Nov 2012 10:50:20 +0100 Message-Id: <1354269021-18433-2-git-send-email-mfojtik@redhat.com> In-Reply-To: <1354269021-18433-1-git-send-email-mfojtik@redhat.com> References: <1354269021-18433-1-git-send-email-mfojtik@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Virus-Checked: Checked by ClamAV on apache.org From: Michal Fojtik Signed-off-by: Michal fojtik --- tests/cimi/test_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cimi/test_helper.rb b/tests/cimi/test_helper.rb index ace38bd..63398c1 100644 --- a/tests/cimi/test_helper.rb +++ b/tests/cimi/test_helper.rb @@ -15,7 +15,7 @@ # under the License. require 'rubygems' -require 'require_relative' +require 'require_relative' if RUBY_VERSION < '1.9' require_relative '../helpers/common.rb' require 'singleton' require_relative "../../server/lib/cimi/models" -- 1.8.0