summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorsersut <serdar@opscode.com>2014-03-12 15:37:45 -0700
committersersut <serdar@opscode.com>2014-03-12 15:37:45 -0700
commit207878a65ddf0c20a5e5ecc4db8a7d99c6322e11 (patch)
tree25d4848912bfa32e2ea15dff8e748e951b645123 /Gemfile
parent7ab234961718d8637dd102eccae98daf605b0c60 (diff)
parent3a5cafa3d865cb6960fce22aa62cde8b0bee1b62 (diff)
downloadchef-207878a65ddf0c20a5e5ecc4db8a7d99c6322e11.tar.gz
Merge branch 'CHEF-4946' of github.com:criteo/chef into contributions-cc-51
Conflicts: Gemfile
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 546e40dc1b..1418235ebc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ group(:development, :test) do
gem "simplecov"
gem 'rack', "~> 1.5.1"
- gem 'ruby-shadow', :platforms => :ruby unless RUBY_PLATFORM.downcase.match(/aix/)
+ gem 'ruby-shadow', :platforms => :ruby unless RUBY_PLATFORM.downcase.match(/(aix|cygwin)/)
end
# If you want to load debugging tools into the bundle exec sandbox,