diff options
| author | Marc A. Paradise <marc.paradise@gmail.com> | 2019-04-08 10:01:41 -0400 |
|---|---|---|
| committer | Marc A. Paradise <marc.paradise@gmail.com> | 2019-04-24 13:25:58 -0400 |
| commit | a31851492fb2cd8d03d57fa774283cb8b6d0b102 (patch) | |
| tree | 2ebdf2792bfec17ab5a4d01ea89ae68c912df6b0 | |
| parent | 9039cea70004a3197d4db141c1ea5e459ece964e (diff) | |
| download | chef-a31851492fb2cd8d03d57fa774283cb8b6d0b102.tar.gz | |
Remove bootstrap include
This was unnecessary since this class does not refer
to Bootstrap, and it was causing warning messages at runtime
about Bootstrap constants being defined twice.
This didn't happen previously because Bootstrap did not
have any constants defined until after the conversion to Train.
Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
| -rw-r--r-- | lib/chef/knife/bootstrap/chef_vault_handler.rb | 1 | ||||
| -rw-r--r-- | lib/chef/knife/bootstrap/client_builder.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/lib/chef/knife/bootstrap/chef_vault_handler.rb b/lib/chef/knife/bootstrap/chef_vault_handler.rb index 24ed0eb379..233350de73 100644 --- a/lib/chef/knife/bootstrap/chef_vault_handler.rb +++ b/lib/chef/knife/bootstrap/chef_vault_handler.rb @@ -15,7 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -require "chef/knife/bootstrap" class Chef class Knife diff --git a/lib/chef/knife/bootstrap/client_builder.rb b/lib/chef/knife/bootstrap/client_builder.rb index 5fb0edc31b..09f4f67ced 100644 --- a/lib/chef/knife/bootstrap/client_builder.rb +++ b/lib/chef/knife/bootstrap/client_builder.rb @@ -20,7 +20,6 @@ require "chef/node" require "chef/server_api" require "chef/api_client/registration" require "chef/api_client" -require "chef/knife/bootstrap" require "tmpdir" class Chef |