diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-10-26 14:05:23 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2018-10-26 15:48:24 -0700 |
| commit | 921dad6e7287042161eb2ed08250f094ce54a973 (patch) | |
| tree | d5a49b644dbce088a53c0a14779cd05c52b776c7 /lib/chef/exceptions.rb | |
| parent | 19fa0db16f3f2952c378eeb37a4d15e9a142a0be (diff) | |
| download | chef-921dad6e7287042161eb2ed08250f094ce54a973.tar.gz | |
Remove cookbook merging/shadowing from the cookbooker loader
This has been deprecated since forever.
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'lib/chef/exceptions.rb')
| -rw-r--r-- | lib/chef/exceptions.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/chef/exceptions.rb b/lib/chef/exceptions.rb index dafd445d2d..41e0cdb33e 100644 --- a/lib/chef/exceptions.rb +++ b/lib/chef/exceptions.rb @@ -2,7 +2,7 @@ # Author:: Adam Jacob (<adam@chef.io>) # Author:: Seth Falcon (<seth@chef.io>) # Author:: Kyle Goodwin (<kgoodwin@primerevenue.com>) -# Copyright:: Copyright 2008-2017, Chef Software Inc. +# Copyright:: Copyright 2008-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -99,6 +99,7 @@ class Chef # Cookbook loader used to raise an argument error when cookbook not found. # for back compat, need to raise an error that inherits from ArgumentError class CookbookNotFoundInRepo < ArgumentError; end + class CookbookMergingError < RuntimeError; end class RecipeNotFound < ArgumentError; end # AttributeNotFound really means the attribute file could not be found class AttributeNotFound < RuntimeError; end |