summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-05-10 15:44:29 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-05-10 15:44:29 +0000
commitbd5392a99528be2e8e0145a4b940dcf443695096 (patch)
tree3ea9cca000a2d293f80a770e720078cc750a89b0
parent366e87422471abbea15123a4491b5cf960e5cbcc (diff)
downloadchef-bd5392a99528be2e8e0145a4b940dcf443695096.tar.gz
Bump version to 14.1.4 by Chef Expeditorv14.1.4
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 603395249e..c88ef45ea2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.1.3 -->
-## [v14.1.3](https://github.com/chef/chef/tree/v14.1.3) (2018-05-10)
+<!-- latest_release 14.1.4 -->
+## [v14.1.4](https://github.com/chef/chef/tree/v14.1.4) (2018-05-10)
#### Merged Pull Requests
-- Switch Node#role? to use the attributes expansion instead of the run list [#7234](https://github.com/chef/chef/pull/7234) ([coderanger](https://github.com/coderanger))
+- fix git provider: -prune-tags is not available with old git versions, fixes #7233 [#7247](https://github.com/chef/chef/pull/7247) ([rmoriz](https://github.com/rmoriz))
<!-- latest_release -->
<!-- release_rollup since=14.1.1 -->
### Changes since 14.1.1 release
#### Merged Pull Requests
+- fix git provider: -prune-tags is not available with old git versions, fixes #7233 [#7247](https://github.com/chef/chef/pull/7247) ([rmoriz](https://github.com/rmoriz)) <!-- 14.1.4 -->
- Switch Node#role? to use the attributes expansion instead of the run list [#7234](https://github.com/chef/chef/pull/7234) ([coderanger](https://github.com/coderanger)) <!-- 14.1.3 -->
- Remove redundant &quot;?&quot; in knife configure [#7235](https://github.com/chef/chef/pull/7235) ([alexymik](https://github.com/alexymik)) <!-- 14.1.2 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 22049f520c..1bfecc8367 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,10 +15,10 @@ GIT
PATH
remote: .
specs:
- chef (14.1.3)
+ chef (14.1.4)
addressable
bundler (>= 1.10)
- chef-config (= 14.1.3)
+ chef-config (= 14.1.4)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -46,10 +46,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.1.3-universal-mingw32)
+ chef (14.1.4-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.1.3)
+ chef-config (= 14.1.4)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -92,7 +92,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.1.3)
+ chef-config (14.1.4)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index f7e6aaa8b0..fa88345648 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.1.3 \ No newline at end of file
+14.1.4 \ 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 af96638750..601ef69991 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.1.3"
+ VERSION = "14.1.4"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index c9f7dd7d39..37b9594370 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.1.3")
+ VERSION = Chef::VersionString.new("14.1.4")
end
#