summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-08-08 18:27:31 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-08-08 18:27:31 +0000
commita33025d1d2ec661bd64037e4f1e22713e3cf2c59 (patch)
treef95d7ec5ee2cc456b2cfae744cd19ebd369faf47
parentd3878445c7011529d71e526ae0757db2d496f250 (diff)
downloadchef-a33025d1d2ec661bd64037e4f1e22713e3cf2c59.tar.gz
Bump version to 13.3.35 by Chef Expeditorv13.3.35
-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 14b20e1624..7a9d7c1ace 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,15 @@
-<!-- latest_release 13.3.34 -->
-## [v13.3.34](https://github.com/chef/chef/tree/v13.3.34) (2017-08-08)
+<!-- latest_release 13.3.35 -->
+## [v13.3.35](https://github.com/chef/chef/tree/v13.3.35) (2017-08-08)
#### Merged Pull Requests
-- add option to enable unprivileged symlink creation on windows [#6236](https://github.com/chef/chef/pull/6236) ([svmastersamurai](https://github.com/svmastersamurai))
+- Bump omnibus-software version [#6310](https://github.com/chef/chef/pull/6310) ([thommay](https://github.com/thommay))
<!-- latest_release -->
<!-- release_rollup since=13.2.20 -->
### Changes since 13.2.20 release
#### Merged Pull Requests
+- Bump omnibus-software version [#6310](https://github.com/chef/chef/pull/6310) ([thommay](https://github.com/thommay)) <!-- 13.3.35 -->
- add option to enable unprivileged symlink creation on windows [#6236](https://github.com/chef/chef/pull/6236) ([svmastersamurai](https://github.com/svmastersamurai)) <!-- 13.3.34 -->
- Fix git command in DCO sign-off example [#6306](https://github.com/chef/chef/pull/6306) ([edmorley](https://github.com/edmorley)) <!-- 13.3.33 -->
- Add .dockerignore to reduce size of resulting images [#6296](https://github.com/chef/chef/pull/6296) ([tduffield](https://github.com/tduffield)) <!-- 13.3.32 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 68f910d098..b95c57741e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.3.34)
+ chef (13.3.35)
addressable
bundler (>= 1.10)
- chef-config (= 13.3.34)
+ chef-config (= 13.3.35)
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.3.34-universal-mingw32)
+ chef (13.3.35-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.3.34)
+ chef-config (= 13.3.35)
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.3.34)
+ chef-config (13.3.35)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index d9e9042b77..ab27a7e120 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.3.34 \ No newline at end of file
+13.3.35 \ 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 455e1b66e9..33fa62d86a 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -20,7 +20,7 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "13.3.34"
+ VERSION = "13.3.35"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 64a979c15a..682463ca0d 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -22,7 +22,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("13.3.34")
+ VERSION = Chef::VersionString.new("13.3.35")
end
#