diff options
| author | sersut <serdar@opscode.com> | 2013-05-31 14:53:17 -0700 |
|---|---|---|
| committer | sersut <serdar@opscode.com> | 2013-05-31 14:53:17 -0700 |
| commit | e9ba542d3617a9264112cab4744543f662f1e7f5 (patch) | |
| tree | 9b7d88730d63238351c9c94891ca93e65abc10c7 /Gemfile | |
| parent | b9640c7f8968250da6569ddb50ddb616de6c504b (diff) | |
| parent | 8d6d5ab73f5ee588cafbfc0a41ff3521eb8b1664 (diff) | |
| download | chef-e9ba542d3617a9264112cab4744543f662f1e7f5.tar.gz | |
Merge branch 'master' into file-refactor
Conflicts:
lib/chef/exceptions.rb
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -12,7 +12,7 @@ group(:development, :test) do gem "simplecov" gem 'rack', "~> 1.5.1" - gem 'ruby-shadow', :platforms => :ruby unless RUBY_PLATFORM.downcase.match(/(darwin|freebsd)/) + gem 'ruby-shadow', :platforms => :ruby unless RUBY_PLATFORM.downcase.match(/(darwin|freebsd|aix)/) # gem 'awesome_print' # gem 'pry' end |