summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-11-22 19:54:30 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-11-22 19:54:30 +0000
commit89bbdc8b5416e6e5c00b80edd74749a379f97a92 (patch)
treee285bb8ef0f62ddf4dd9e13fb793e30af373ccd9
parentd724e330980c190175794c7454260db170686178 (diff)
downloadchef-89bbdc8b5416e6e5c00b80edd74749a379f97a92.tar.gz
Bump version to 13.6.12 by Expeditorv13.6.12
-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 ca674e1870..6911e4ab3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.6.11 -->
-## [v13.6.11](https://github.com/chef/chef/tree/v13.6.11) (2017-11-22)
+<!-- latest_release 13.6.12 -->
+## [v13.6.12](https://github.com/chef/chef/tree/v13.6.12) (2017-11-22)
#### Merged Pull Requests
-- Fix variable name in solaris service provider [#6596](https://github.com/chef/chef/pull/6596) ([jaymalasinha](https://github.com/jaymalasinha))
+- Don&#39;t try to uninstall bundler on appveyor [#6597](https://github.com/chef/chef/pull/6597) ([btm](https://github.com/btm))
<!-- latest_release -->
<!-- release_rollup since=13.6.4 -->
### Changes since 13.6.4 release
#### Merged Pull Requests
+- Don&#39;t try to uninstall bundler on appveyor [#6597](https://github.com/chef/chef/pull/6597) ([btm](https://github.com/btm)) <!-- 13.6.12 -->
- Fix variable name in solaris service provider [#6596](https://github.com/chef/chef/pull/6596) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 13.6.11 -->
- Revert &quot;add missing functional tests for users&quot; [#6588](https://github.com/chef/chef/pull/6588) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.6.10 -->
- Filter out periods from tmux session name [#6593](https://github.com/chef/chef/pull/6593) ([afn](https://github.com/afn)) <!-- 13.6.9 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 61619ae4b3..8498af5ec2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.6.11)
+ chef (13.6.12)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.11)
+ chef-config (= 13.6.12)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -47,10 +47,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.6.11-universal-mingw32)
+ chef (13.6.12-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.11)
+ chef-config (= 13.6.12)
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 (13.6.11)
+ chef-config (13.6.12)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 4ebdf9e2b8..dcaab2f153 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.6.11 \ No newline at end of file
+13.6.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 1359f95633..70afd7efe1 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.6.11"
+ VERSION = "13.6.12"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index c17b044e1a..1f532aca81 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.6.11")
+ VERSION = Chef::VersionString.new("13.6.12")
end
#