diff options
| author | lamont-granquist <lamont@scriptkiddie.org> | 2014-04-08 17:22:39 -0700 |
|---|---|---|
| committer | lamont-granquist <lamont@scriptkiddie.org> | 2014-04-08 17:22:39 -0700 |
| commit | 02efc1dfeeff5e357c2993408eccd71d0e913733 (patch) | |
| tree | 2875e2fe1d1c87d0f587adb95fa1744fae5e63e4 | |
| parent | 3c6e5e772d22fd5bcf435fcda734eb77c1cb9387 (diff) | |
| parent | 7262b4441cfb95cf9a5aa28b12c182c8466f0b52 (diff) | |
| download | chef-02efc1dfeeff5e357c2993408eccd71d0e913733.tar.gz | |
Merge pull request #1365 from opscode/lcg/pin-sdoc
pin sdoc to make solaris builds happy
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | chef/chef.gemspec | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ea0f78ae66..f0ef9536b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * Chef now gracefully handles corrupted cache files. * SIGTERM will once-more kill a non-daemonized chef-client (CHEF-5172) * bump up upper limit on json gem to 1.8.1 (CHEF-4632) +* pin sdoc to 0.3.0 due to solaris packaging issues. ## Last Release: 10.30.4 (02/18/2014) diff --git a/chef/chef.gemspec b/chef/chef.gemspec index 0e541dabc3..a1c5c017a4 100644 --- a/chef/chef.gemspec +++ b/chef/chef.gemspec @@ -39,7 +39,8 @@ Gem::Specification.new do |s| %w{erubis uuidtools}.each { |gem| s.add_dependency gem } # development_dependency thin: eventmachine 0.12.10 doesn't support Ruby 1.9 on Windows - %w(rdoc sdoc rake rack rspec_junit_formatter).each { |gem| s.add_development_dependency gem } + s.add_development_dependency "sdoc", "~> 0.3.0" + %w(rdoc rake rack rspec_junit_formatter).each { |gem| s.add_development_dependency gem } %w(rspec-core rspec-expectations rspec-mocks).each { |gem| s.add_development_dependency gem, "~> 2.12.0" } s.bindir = "bin" |