From 78dddf4cccc4b4d762e31c40a0576d4573933798 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Thu, 20 Oct 2016 08:15:51 -0700 Subject: Fix a few bad copyrights I think this happened when we merged the Opscode and Chef copyrights Signed-off-by: Tim Smith --- lib/chef/dsl/core.rb | 2 +- lib/chef/dsl/declare_resource.rb | 2 +- lib/chef/dsl/method_missing.rb | 2 +- lib/chef/dsl/recipe.rb | 2 +- lib/chef/dsl/universal.rb | 2 +- lib/chef/http.rb | 2 +- lib/chef/resource/file.rb | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/chef/dsl/core.rb b/lib/chef/dsl/core.rb index 11507857cf..d7c5b6a006 100644 --- a/lib/chef/dsl/core.rb +++ b/lib/chef/dsl/core.rb @@ -1,7 +1,7 @@ #-- # Author:: Adam Jacob () # Author:: Christopher Walters () -# Copyright:: Copyright 2008-2016, 2009-2015 Chef Software, Inc. +# Copyright:: Copyright 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/chef/dsl/declare_resource.rb b/lib/chef/dsl/declare_resource.rb index 2ebef98bd4..5bd1f7fb8e 100644 --- a/lib/chef/dsl/declare_resource.rb +++ b/lib/chef/dsl/declare_resource.rb @@ -1,7 +1,7 @@ #-- # Author:: Adam Jacob () # Author:: Christopher Walters -# Copyright:: Copyright 2008-2016, 2009-2015 Chef Software, Inc. +# Copyright:: Copyright 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/chef/dsl/method_missing.rb b/lib/chef/dsl/method_missing.rb index 0d7ded30f3..51c3eac606 100644 --- a/lib/chef/dsl/method_missing.rb +++ b/lib/chef/dsl/method_missing.rb @@ -1,5 +1,5 @@ #-- -# Copyright:: Copyright 2008-2016, 2009-2015 Chef Software, Inc. +# Copyright:: Copyright 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/chef/dsl/recipe.rb b/lib/chef/dsl/recipe.rb index 1bb8f130af..e2bd070179 100644 --- a/lib/chef/dsl/recipe.rb +++ b/lib/chef/dsl/recipe.rb @@ -1,7 +1,7 @@ #-- # Author:: Adam Jacob () # Author:: Christopher Walters () -# Copyright:: Copyright 2008-2016, 2009-2015 Chef Software, Inc. +# Copyright:: Copyright 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/chef/dsl/universal.rb b/lib/chef/dsl/universal.rb index 810792f542..6e3d162b6f 100644 --- a/lib/chef/dsl/universal.rb +++ b/lib/chef/dsl/universal.rb @@ -1,7 +1,7 @@ #-- # Author:: Adam Jacob () # Author:: Christopher Walters () -# Copyright:: Copyright 2008-2016, 2009-2015 Chef Software, Inc. +# Copyright:: Copyright 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/chef/http.rb b/lib/chef/http.rb index dd3c55bf19..12acae953c 100644 --- a/lib/chef/http.rb +++ b/lib/chef/http.rb @@ -5,7 +5,7 @@ # Author:: Christopher Brown () # Author:: Christopher Walters () # Author:: Daniel DeLeo () -# Copyright:: Copyright 2009-2016, 2013-2015 Chef Software, Inc. +# Copyright:: Copyright 2009-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/chef/resource/file.rb b/lib/chef/resource/file.rb index 207de63778..5c275a574f 100644 --- a/lib/chef/resource/file.rb +++ b/lib/chef/resource/file.rb @@ -1,7 +1,7 @@ # # Author:: Adam Jacob () # Author:: Seth Chisamore () -# Copyright:: Copyright 2008-2016, 2011-2015 Chef Software, Inc. +# Copyright:: Copyright 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); -- cgit v1.2.1 From 04431f74a815fa9a9e6bb51291893a536ab3db92 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Thu, 20 Oct 2016 08:18:22 -0700 Subject: More Opscode -> Chef updates Signed-off-by: Tim Smith --- lib/chef/chef_fs/file_system/chef_server/versioned_cookbook_dir.rb | 2 +- lib/chef/mixin/shell_out.rb | 2 +- lib/chef/provider/ruby_block.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/chef/chef_fs/file_system/chef_server/versioned_cookbook_dir.rb b/lib/chef/chef_fs/file_system/chef_server/versioned_cookbook_dir.rb index 269e160d43..b7c96c42e1 100644 --- a/lib/chef/chef_fs/file_system/chef_server/versioned_cookbook_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/versioned_cookbook_dir.rb @@ -24,7 +24,7 @@ class Chef module ChefServer class VersionedCookbookDir < CookbookDir # See Erchef code - # https://github.com/opscode/chef_objects/blob/968a63344d38fd507f6ace05f73d53e9cd7fb043/src/chef_regex.erl#L94 + # https://github.com/chef/chef_objects/blob/968a63344d38fd507f6ace05f73d53e9cd7fb043/src/chef_regex.erl#L94 VALID_VERSIONED_COOKBOOK_NAME = /^([.a-zA-Z0-9_-]+)-(\d+\.\d+\.\d+)$/ def initialize(name, parent, options = {}) diff --git a/lib/chef/mixin/shell_out.rb b/lib/chef/mixin/shell_out.rb index a258a91075..d8607c8de7 100644 --- a/lib/chef/mixin/shell_out.rb +++ b/lib/chef/mixin/shell_out.rb @@ -61,7 +61,7 @@ class Chef [:command_log_prepend, :log_tag] ] # CHEF-3090: Deprecate command_log_level and command_log_prepend - # Patterned after https://github.com/opscode/chef/commit/e1509990b559984b43e428d4d801c394e970f432 + # Patterned after https://github.com/chef/chef/commit/e1509990b559984b43e428d4d801c394e970f432 def run_command_compatible_options(command_args) return command_args unless command_args.last.is_a?(Hash) diff --git a/lib/chef/provider/ruby_block.rb b/lib/chef/provider/ruby_block.rb index 0817b14044..18ee9cecc5 100644 --- a/lib/chef/provider/ruby_block.rb +++ b/lib/chef/provider/ruby_block.rb @@ -1,7 +1,7 @@ # # Author:: Adam Jacob () # Author:: AJ Christensen () -# Copyright:: Copyright 2009-2016, Opscode +# Copyright:: Copyright 2009-2016, Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); -- cgit v1.2.1