diff options
| author | Daniel DeLeo <dan@opscode.com> | 2011-02-24 15:05:38 -0800 |
|---|---|---|
| committer | Daniel DeLeo <dan@opscode.com> | 2011-02-24 15:39:35 -0800 |
| commit | d9c0d6fc8b10eae1f940595df13a63c54fe8b4c9 (patch) | |
| tree | a7ff9e51293807a70f83230f4221d386186c6a6d /chef-server-api | |
| parent | 7ad48edd2ed069dadcc0c366fe0bc615bf09c505 (diff) | |
| download | chef-d9c0d6fc8b10eae1f940595df13a63c54fe8b4c9.tar.gz | |
[CHEF-1802] backport new behavior for Regexp.union to fix rack bug
imported code from:
https://github.com/marcandre/backports/blob/master/lib/backports/1.8.7/regexp.rb
which adds support for passing an array to Regexp.union, which works
around this bug in rack:
https://github.com/rack/rack/issues/29
Diffstat (limited to 'chef-server-api')
| -rw-r--r-- | chef-server-api/config/init.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chef-server-api/config/init.rb b/chef-server-api/config/init.rb index 6c5319b9eb..281224d530 100644 --- a/chef-server-api/config/init.rb +++ b/chef-server-api/config/init.rb @@ -39,6 +39,8 @@ require 'chef/cookbook_version' require 'chef/sandbox' require 'chef/checksum' require 'chef/environment' +require 'chef/monkey_patches/regexp' + require 'mixlib/authentication' |