summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md8
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/resource.rb5
-rw-r--r--lib/chef/resource/apt_repository.rb10
-rw-r--r--lib/chef/version.rb2
-rw-r--r--spec/unit/resource/apt_repository_spec.rb5
8 files changed, 18 insertions, 26 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7cd11f1e71..ac4dbf4329 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,17 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.0.31 -->
-## [v14.0.31](https://github.com/chef/chef/tree/v14.0.31) (2018-01-26)
+<!-- latest_release 14.0.33 -->
+## [v14.0.33](https://github.com/chef/chef/tree/v14.0.33) (2018-01-29)
#### Merged Pull Requests
-- Force the creation of a relative link for cacerts [#6798](https://github.com/chef/chef/pull/6798) ([thommay](https://github.com/thommay))
+- Remove epic_fail alias to ignore_failure [#6801](https://github.com/chef/chef/pull/6801) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Remove epic_fail alias to ignore_failure [#6801](https://github.com/chef/chef/pull/6801) ([tas50](https://github.com/tas50)) <!-- 14.0.33 -->
+- Nillable properties are the default now [#6800](https://github.com/chef/chef/pull/6800) ([thommay](https://github.com/thommay)) <!-- 14.0.32 -->
- Force the creation of a relative link for cacerts [#6798](https://github.com/chef/chef/pull/6798) ([thommay](https://github.com/thommay)) <!-- 14.0.31 -->
- use a relative link so that docker does not drop our ca bundle link [#6796](https://github.com/chef/chef/pull/6796) ([thommay](https://github.com/thommay)) <!-- 14.0.30 -->
- fix node assignment of ImmutableArrays to VividMashes/AttrArrays [#6790](https://github.com/chef/chef/pull/6790) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.29 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index e7327a2adf..cc937fd959 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,10 +35,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.31)
+ chef (14.0.33)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.31)
+ chef-config (= 14.0.33)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -65,10 +65,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.0.31-universal-mingw32)
+ chef (14.0.33-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.31)
+ chef-config (= 14.0.33)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -110,7 +110,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.0.31)
+ chef-config (14.0.33)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index b12334e930..7790940aa4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.31 \ No newline at end of file
+14.0.33 \ No newline at end of file
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index c838ea6e79..272a1c56f9 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -21,7 +21,7 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "14.0.31"
+ VERSION = "14.0.33"
end
#
diff --git a/lib/chef/resource.rb b/lib/chef/resource.rb
index 7d491354b7..ac1146a647 100644
--- a/lib/chef/resource.rb
+++ b/lib/chef/resource.rb
@@ -536,11 +536,6 @@ class Chef
property :ignore_failure, [ TrueClass, FalseClass ], default: false, desired_state: false
#
- # Equivalent to #ignore_failure.
- #
- alias :epic_fail :ignore_failure
-
- #
# Make this resource into an exact (shallow) copy of the other resource.
#
# @param resource [Chef::Resource] The resource to copy from.
diff --git a/lib/chef/resource/apt_repository.rb b/lib/chef/resource/apt_repository.rb
index 5da0b4e37b..5b81112cbe 100644
--- a/lib/chef/resource/apt_repository.rb
+++ b/lib/chef/resource/apt_repository.rb
@@ -30,17 +30,17 @@ class Chef
property :repo_name, String, name_property: true
property :uri, String
- property :distribution, [ String, nil, false ], default: lazy { node["lsb"]["codename"] }, nillable: true, coerce: proc { |x| x ? x : nil }
+ property :distribution, [ String, nil, false ], default: lazy { node["lsb"]["codename"] }, coerce: proc { |x| x ? x : nil }
property :components, Array, default: []
- property :arch, [String, nil, false], default: nil, nillable: true, coerce: proc { |x| x ? x : nil }
+ property :arch, [String, nil, false], default: nil, coerce: proc { |x| x ? x : nil }
property :trusted, [TrueClass, FalseClass], default: false
# whether or not to add the repository as a source repo, too
property :deb_src, [TrueClass, FalseClass], default: false
- property :keyserver, [String, nil, false], default: "keyserver.ubuntu.com", nillable: true, coerce: proc { |x| x ? x : nil }
+ property :keyserver, [String, nil, false], default: "keyserver.ubuntu.com", coerce: proc { |x| x ? x : nil }
property :key, [String, Array, nil, false], default: [], coerce: proc { |x| x ? Array(x) : nil }
- property :key_proxy, [String, nil, false], default: nil, nillable: true, coerce: proc { |x| x ? x : nil }
+ property :key_proxy, [String, nil, false], default: nil, coerce: proc { |x| x ? x : nil }
- property :cookbook, [String, nil, false], default: nil, desired_state: false, nillable: true, coerce: proc { |x| x ? x : nil }
+ property :cookbook, [String, nil, false], default: nil, desired_state: false, coerce: proc { |x| x ? x : nil }
property :cache_rebuild, [TrueClass, FalseClass], default: true, desired_state: false
default_action :add
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index a3d5796260..3725899a57 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("14.0.31")
+ VERSION = Chef::VersionString.new("14.0.33")
end
#
diff --git a/spec/unit/resource/apt_repository_spec.rb b/spec/unit/resource/apt_repository_spec.rb
index 445df4a0d1..fecf3be582 100644
--- a/spec/unit/resource/apt_repository_spec.rb
+++ b/spec/unit/resource/apt_repository_spec.rb
@@ -28,11 +28,6 @@ describe Chef::Resource::AptRepository do
expect(resource.keyserver).to eql("keyserver.ubuntu.com")
end
- it "default distribution is nillable" do
- expect(resource.distribution(nil)).to eql(nil)
- expect(resource.distribution).to eql(nil)
- end
-
it "resolves to a Noop class when on non-linux OS" do
node.automatic[:os] = "windows"
node.automatic[:platform_family] = "windows"
View Lorry Controller Status