From: Hunter Haugen <hunter@puppet.com>
Date: Mon, 31 Oct 2016 16:51:36 +0000 (-0700)
Subject: Merge pull request #633 from puppetlabs/Paula_modulesync
X-Git-Tag: 2.4.0~17
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=eff71a686d8dc2ed6b0e47b57d04c316f2332429;hp=68cdcf71a3c4cdc0d431719494a4572c28afd9c4;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #633 from puppetlabs/Paula_modulesync

(MODULES-3983) Update parallel_tests for ruby 2.0.0
---

diff --git a/Gemfile b/Gemfile
index c97275b..8222ef0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,8 @@ group :development, :unit_tests do
   gem 'rspec-puppet', '>= 2.3.2'
   gem 'rspec-puppet-facts'
   gem 'simplecov'
-  gem 'parallel_tests'
+  gem 'parallel_tests', '< 2.10.0' if RUBY_VERSION < '2.0.0'
+  gem 'parallel_tests' if RUBY_VERSION >= '2.0.0'
   gem 'rubocop', '0.41.2' if RUBY_VERSION < '2.0.0'
   gem 'rubocop' if RUBY_VERSION >= '2.0.0'
   gem 'rubocop-rspec', '~> 1.6' if RUBY_VERSION >= '2.3.0'