summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-10-30 00:20:00 +0000
committerChef Expeditor <chef-ci@chef.io>2018-10-30 00:20:00 +0000
commit219eec0f84a06096a80fab0b4bb5c6e42c6b14da (patch)
treead7e3962d2daf26b410bf56a5197d90299ebc5af
parentde638940366eb4862e58928073255607c9f1d1c5 (diff)
downloadchef-219eec0f84a06096a80fab0b4bb5c6e42c6b14da.tar.gz
Bump version to 13.12.1 by Chef Expeditorv13.12.1
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock12
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7668e62cb5..c60f11fa2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.12.0 -->
-## [v13.12.0](https://github.com/chef/chef/tree/v13.12.0) (2018-10-29)
+<!-- latest_release 13.12.1 -->
+## [v13.12.1](https://github.com/chef/chef/tree/v13.12.1) (2018-10-30)
#### Merged Pull Requests
-- Bump dependencies / slim the package size [#7805](https://github.com/chef/chef/pull/7805) ([tas50](https://github.com/tas50))
+- Pin rake to 12.0 to prevent shipping 2 copies [#7812](https://github.com/chef/chef/pull/7812) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.11.3 -->
### Changes since 13.11.3 release
#### Merged Pull Requests
+- Pin rake to 12.0 to prevent shipping 2 copies [#7812](https://github.com/chef/chef/pull/7812) ([tas50](https://github.com/tas50)) <!-- 13.12.1 -->
- Bump dependencies / slim the package size [#7805](https://github.com/chef/chef/pull/7805) ([tas50](https://github.com/tas50)) <!-- 13.12.0 -->
- Backport omnibus cleanup + MSI speedup logic from Chef 14 [#7739](https://github.com/chef/chef/pull/7739) ([tas50](https://github.com/tas50)) <!-- 13.11.4 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 260e9dca43..c8c87e6635 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (13.12.0)
+ chef (13.12.1)
addressable
bundler (>= 1.10)
- chef-config (= 13.12.0)
+ chef-config (= 13.12.1)
chef-zero (~> 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -31,10 +31,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.12.0-universal-mingw32)
+ chef (13.12.1-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.12.0)
+ chef-config (= 13.12.1)
chef-zero (~> 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -76,7 +76,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.12.0)
+ chef-config (13.12.1)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
@@ -403,4 +403,4 @@ DEPENDENCIES
yard
BUNDLED WITH
- 1.16.6
+ 1.17.1
diff --git a/VERSION b/VERSION
index 5ce59df24c..1e66d67b1b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.12.0 \ No newline at end of file
+13.12.1 \ 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 4c57a2261a..830888c218 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 = "13.12.0"
+ VERSION = "13.12.1"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 201115ae2d..642e174381 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("13.12.0")
+ VERSION = Chef::VersionString.new("13.12.1")
end
#