diff options
| author | Bryan McLellan <btm@opscode.com> | 2012-10-30 13:44:23 -0700 |
|---|---|---|
| committer | Bryan McLellan <btm@opscode.com> | 2012-10-30 13:44:23 -0700 |
| commit | 40bb09b6605852b362875ec99438f22af6c35676 (patch) | |
| tree | 932e28c75bcccc5a18a86d1371612b0fcdd9429c /Gemfile | |
| parent | 7c757e2281e862a26c22795ffd957e6048da02b1 (diff) | |
| parent | 6668c614b3762ded59595241f4719dbec98eaa1f (diff) | |
| download | chef-40bb09b6605852b362875ec99438f22af6c35676.tar.gz | |
Merge branch '10-stable'
Conflicts:
chef-expander/lib/chef/expander/version.rb
chef-server-api/lib/chef-server-api/version.rb
chef-server-webui/lib/chef-server-webui/version.rb
chef-server/lib/chef-server/version.rb
chef-solr/lib/chef/solr/version.rb
chef/lib/chef/node/attribute.rb
lib/chef/node.rb
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -7,11 +7,7 @@ gem "ronn" group(:development, :test) do gem 'rack' - - # The 'ruby' platform is surprisingly just unix-y platforms - # thin requires eventmachine, which won't work under Ruby 1.9 on Windows - # http://gembundler.com/man/gemfile.5.html - gem 'thin', :platforms => :ruby + gem 'thin' # Eventmachine 1.0.0 is causing functional test failures on Solaris # 9 SPARC. Pinning em to 0.12.10 solves this issue until we can |