summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-01-29 19:30:34 +0000
committerChef Expeditor <chef-ci@chef.io>2019-01-29 19:30:34 +0000
commit3aea13eba1912dd8a9a289f3807ed8d9ca2de6a6 (patch)
treefbf8437b13999853a25bdaf92de78b4870ca6100
parent04670a87ba274382a8d6be30f32dfbb9a037570b (diff)
downloadchef-3aea13eba1912dd8a9a289f3807ed8d9ca2de6a6.tar.gz
Bump version to 15.0.149 by Chef Expeditorv15.0.149
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock12
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8306da1a27..e778eaf002 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.0.148 -->
-## [v15.0.148](https://github.com/chef/chef/tree/v15.0.148) (2019-01-29)
+<!-- latest_release 15.0.149 -->
+## [v15.0.149](https://github.com/chef/chef/tree/v15.0.149) (2019-01-29)
#### Merged Pull Requests
-- Update Rubygems to 3.0.2 [#8174](https://github.com/chef/chef/pull/8174) ([tas50](https://github.com/tas50))
+- git: Don&#39;t display the repo URL when sensitive property is set [#8179](https://github.com/chef/chef/pull/8179) ([dheerajd-msys](https://github.com/dheerajd-msys))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- git: Don&#39;t display the repo URL when sensitive property is set [#8179](https://github.com/chef/chef/pull/8179) ([dheerajd-msys](https://github.com/dheerajd-msys)) <!-- 15.0.149 -->
- Update Rubygems to 3.0.2 [#8174](https://github.com/chef/chef/pull/8174) ([tas50](https://github.com/tas50)) <!-- 15.0.148 -->
- [knife] Remove duplicate code blocks in the knife cookbook upload command [#8135](https://github.com/chef/chef/pull/8135) ([f9n](https://github.com/f9n)) <!-- 15.0.147 -->
- Cleanup requires / includes in knife supermarket [#8166](https://github.com/chef/chef/pull/8166) ([tas50](https://github.com/tas50)) <!-- 15.0.146 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index a394762ff9..d62b20b110 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.148)
+ chef (15.0.149)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.148)
+ chef-config (= 15.0.149)
chef-zero (>= 14.0.11)
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 (15.0.148-universal-mingw32)
+ chef (15.0.149-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.148)
+ chef-config (= 15.0.149)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -104,7 +104,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (15.0.148)
+ chef-config (15.0.149)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
@@ -366,7 +366,7 @@ GEM
hashdiff
websocket (1.2.8)
win32-api (1.5.3-universal-mingw32)
- win32-certstore (0.2.2)
+ win32-certstore (0.2.3)
ffi
mixlib-shellout
win32-dir (0.5.1)
diff --git a/VERSION b/VERSION
index 797df40ca6..0c4f5d115a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.148 \ No newline at end of file
+15.0.149 \ 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 02d70ce7a4..0400c3d0f5 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 = "15.0.148".freeze
+ VERSION = "15.0.149".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0488982802..3ad4451593 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("15.0.148")
+ VERSION = Chef::VersionString.new("15.0.149")
end
#