summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-07-14 15:03:42 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-07-14 15:03:42 +0000
commit3699042c1b17d8d07d249255962b9e2044cd332f (patch)
tree29cf387b6a9016e4ade57db6a8f335b20444b942
parentde7528fb4ee2997bb64036dde00df6ec54f86ae1 (diff)
downloadchef-3699042c1b17d8d07d249255962b9e2044cd332f.tar.gz
Bump version to 13.3.12 by Chef Expeditorv13.3.12
-rw-r--r--CHANGELOG.md5
-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, 11 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbb0d6867b..8c2fedc3b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
This changelog reflects the current state of chef's master branch on github and may not reflect the current released version of chef, which is [![Gem Version](https://badge.fury.io/rb/chef.svg)](https://badge.fury.io/rb/chef).
-## [v13.3.11](https://github.com/chef/chef/tree/v13.3.11) (2017-07-13)
-[Full Changelog](https://github.com/chef/chef/compare/v13.0.118...v13.3.11)
+## [v13.3.12](https://github.com/chef/chef/tree/v13.3.12) (2017-07-14)
+[Full Changelog](https://github.com/chef/chef/compare/v13.0.118...v13.3.12)
**Closed issues:**
@@ -9,6 +9,7 @@ This changelog reflects the current state of chef's master branch on github and
**Merged pull requests:**
+- Use new Expeditor config format [\#6272](https://github.com/chef/chef/pull/6272) ([tduffield](https://github.com/tduffield))
- \[MSYS-590\]Make mount idempotent on Aix [\#6213](https://github.com/chef/chef/pull/6213) ([NAshwini](https://github.com/NAshwini))
- Use socketless local mode by default [\#6177](https://github.com/chef/chef/pull/6177) ([coderanger](https://github.com/coderanger))
- convert breakpoint resource to a custom resource [\#6176](https://github.com/chef/chef/pull/6176) ([lamont-granquist](https://github.com/lamont-granquist))
diff --git a/Gemfile.lock b/Gemfile.lock
index 64919e12a3..829ea869be 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -30,10 +30,10 @@ GIT
PATH
remote: .
specs:
- chef (13.3.11)
+ chef (13.3.12)
addressable
bundler (>= 1.10)
- chef-config (= 13.3.11)
+ chef-config (= 13.3.12)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -60,10 +60,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.3.11-universal-mingw32)
+ chef (13.3.12-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.3.11)
+ chef-config (= 13.3.12)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -105,7 +105,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.3.11)
+ chef-config (13.3.12)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 3498ae7352..6c63e0ce1e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.3.11 \ No newline at end of file
+13.3.12 \ 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 bbf80d6e9c..dfd347a6cb 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.3.11"
+ VERSION = "13.3.12"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index a1d9c24906..33e6e698c5 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.3.11")
+ VERSION = Chef::VersionString.new("13.3.12")
end
#