summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-10-17 03:26:00 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-10-17 03:26:00 +0000
commite6e8c083fca20e86e55e64ccd116aec87d5a54ae (patch)
tree0ff54485d61032bda14241195fcd8aefb0add05e
parent6b673bdd3b88b09dc49b1c1ea21a9a5c1b8fa2af (diff)
downloadchef-e6e8c083fca20e86e55e64ccd116aec87d5a54ae.tar.gz
Bump version to 12.21.19 by Chef Expeditorv12.21.19
-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 dd54c1be6f..4b82bf43ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 12.21.18 -->
-## [v12.21.18](https://github.com/chef/chef/tree/v12.21.18) (2017-10-16)
+<!-- latest_release 12.21.19 -->
+## [v12.21.19](https://github.com/chef/chef/tree/v12.21.19) (2017-10-17)
#### Merged Pull Requests
-- Add environment/cwd to bundle freeze script [#6499](https://github.com/chef/chef/pull/6499) ([scotthain](https://github.com/scotthain))
+- bump a copyright date to kick off a build [#6501](https://github.com/chef/chef/pull/6501) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=13.5.3 -->
### Changes since 13.5.3 release
#### Merged Pull Requests
+- bump a copyright date to kick off a build [#6501](https://github.com/chef/chef/pull/6501) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 12.21.19 -->
- Add environment/cwd to bundle freeze script [#6499](https://github.com/chef/chef/pull/6499) ([scotthain](https://github.com/scotthain)) <!-- 12.21.18 -->
- backport of #6490 [#6492](https://github.com/chef/chef/pull/6492) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 12.21.17 -->
- Support new CriticalOhaiPlugins (backport #6486 to chef-12) [#6487](https://github.com/chef/chef/pull/6487) ([jaymzh](https://github.com/jaymzh)) <!-- 12.21.16 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index f5305cd087..57735cb6a1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,10 +38,10 @@ GIT
PATH
remote: .
specs:
- chef (12.21.18)
+ chef (12.21.19)
addressable
bundler (>= 1.10)
- chef-config (= 12.21.18)
+ chef-config (= 12.21.19)
chef-zero (>= 4.8, < 13)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -67,10 +67,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (12.21.18-universal-mingw32)
+ chef (12.21.19-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.21.18)
+ chef-config (= 12.21.19)
chef-zero (>= 4.8, < 13)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -111,7 +111,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (12.21.18)
+ chef-config (12.21.19)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index a4a2b9e2f7..c1c6af8efc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.21.18 \ No newline at end of file
+12.21.19 \ 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 d526a85a2c..01f1e6d0b4 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 = "12.21.18"
+ VERSION = "12.21.19"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 8509608f37..bc2b4e2bb9 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -21,7 +21,7 @@
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "12.21.18"
+ VERSION = "12.21.19"
end
#