summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 92405eaa1e..4d2c4ebc7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.0.102 -->
-## [v14.0.102](https://github.com/chef/chef/tree/v14.0.102) (2018-03-02)
+<!-- latest_release 14.0.103 -->
+## [v14.0.103](https://github.com/chef/chef/tree/v14.0.103) (2018-03-02)
#### Merged Pull Requests
-- bump appbundler again, again [#6931](https://github.com/chef/chef/pull/6931) ([lamont-granquist](https://github.com/lamont-granquist))
+- Allow specifying a comment for routes [#6929](https://github.com/chef/chef/pull/6929) ([tomdoherty](https://github.com/tomdoherty))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Allow specifying a comment for routes [#6929](https://github.com/chef/chef/pull/6929) ([tomdoherty](https://github.com/tomdoherty)) <!-- 14.0.103 -->
- bump appbundler again, again [#6931](https://github.com/chef/chef/pull/6931) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.102 -->
- use appbundler 0.11.1 for omnibus builds [#6930](https://github.com/chef/chef/pull/6930) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.101 -->
- Remove the :uninstall action from chocolatey_package - CHEF-21 [#6920](https://github.com/chef/chef/pull/6920) ([tas50](https://github.com/tas50)) <!-- 14.0.100 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index bb138e086d..dd2e206c5a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.102)
+ chef (14.0.103)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.102)
+ chef-config (= 14.0.103)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -57,10 +57,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.0.102-universal-mingw32)
+ chef (14.0.103-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.102)
+ chef-config (= 14.0.103)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -102,7 +102,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.0.102)
+ chef-config (14.0.103)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 3dd73e5e08..dbf37acdd8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.102 \ No newline at end of file
+14.0.103 \ 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 9b819e6356..fea0ce6744 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 = "14.0.102"
+ VERSION = "14.0.103"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index a61748e413..2594227b75 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("14.0.102")
+ VERSION = Chef::VersionString.new("14.0.103")
end
#