summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md9
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock19
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
-rw-r--r--omnibus/Gemfile.lock2
-rw-r--r--omnibus_overrides.rb2
9 files changed, 22 insertions, 20 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4d8e06b62..a2b0b9d52c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,18 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.1.22 -->
-## [v15.1.22](https://github.com/chef/chef/tree/v15.1.22) (2019-06-24)
+<!-- latest_release 15.1.25 -->
+## [v15.1.25](https://github.com/chef/chef/tree/v15.1.25) (2019-06-25)
#### Merged Pull Requests
-- Update ffi-libarchive to 0.4.10 [#8688](https://github.com/chef/chef/pull/8688) ([tas50](https://github.com/tas50))
+- Pin to ruby-prof 0.17 [#8690](https://github.com/chef/chef/pull/8690) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.0.300 -->
### Changes not yet released to rubygems.org
#### Merged Pull Requests
+- Pin to ruby-prof 0.17 [#8690](https://github.com/chef/chef/pull/8690) ([tas50](https://github.com/tas50)) <!-- 15.1.25 -->
+- Update Rubygems to 3.0.4 [#8689](https://github.com/chef/chef/pull/8689) ([tas50](https://github.com/tas50)) <!-- 15.1.24 -->
+- [scaffolding-chef] Rolling out the scaffolding-chef package [#8679](https://github.com/chef/chef/pull/8679) ([echohack](https://github.com/echohack)) <!-- 15.1.23 -->
- Update ffi-libarchive to 0.4.10 [#8688](https://github.com/chef/chef/pull/8688) ([tas50](https://github.com/tas50)) <!-- 15.1.22 -->
- Bump ohai to 15.1.5 [#8681](https://github.com/chef/chef/pull/8681) ([chef-ci](https://github.com/chef-ci)) <!-- 15.1.21 -->
- [chef-client] [scaffolding-chef] add new build configuration for scaffolding-chef [#8678](https://github.com/chef/chef/pull/8678) ([echohack](https://github.com/echohack)) <!-- 15.1.20 -->
diff --git a/Gemfile b/Gemfile
index 5149e1427c..37ec9e1990 100644
--- a/Gemfile
+++ b/Gemfile
@@ -45,7 +45,7 @@ end
# Everything except AIX
group(:ruby_prof) do
- gem "ruby-prof"
+ gem "ruby-prof", "< 0.18" # 0.18 includes a x64-mingw32 gem, which doesn't load correctly. See https://github.com/ruby-prof/ruby-prof/issues/255
end
# Everything except AIX and Windows
diff --git a/Gemfile.lock b/Gemfile.lock
index 4f124fa82e..37dfe90edc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.1.22)
+ chef (15.1.25)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.1.22)
+ chef-config (= 15.1.25)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -57,11 +57,11 @@ PATH
train-core (~> 2.0, >= 2.0.12)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.1.22-universal-mingw32)
+ chef (15.1.25-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.1.22)
+ chef-config (= 15.1.25)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -103,13 +103,13 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.1.22)
- chef (= 15.1.22)
+ chef-bin (15.1.25)
+ chef (= 15.1.25)
PATH
remote: chef-config
specs:
- chef-config (15.1.22)
+ chef-config (15.1.25)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
@@ -300,8 +300,7 @@ GEM
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.4.0)
- ruby-prof (0.18.0)
- ruby-prof (0.18.0-x64-mingw32)
+ ruby-prof (0.17.0)
ruby-progressbar (1.10.1)
ruby-shadow (2.5.0)
rubyntlm (0.6.2)
@@ -436,7 +435,7 @@ DEPENDENCIES
rspec-expectations (~> 3.5)
rspec-mocks (~> 3.5)
rspec_junit_formatter (~> 0.2.0)
- ruby-prof
+ ruby-prof (< 0.18)
ruby-shadow
simplecov
webmock
diff --git a/VERSION b/VERSION
index a5154b7aa3..dc42f83b37 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.1.22 \ No newline at end of file
+15.1.25 \ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index 0110aabb7c..aea2c87a37 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
module ChefBin
CHEFBIN_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.1.22".freeze
+ VERSION = "15.1.25".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 21b27e807b..417c827e5f 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.1.22".freeze
+ VERSION = "15.1.25".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0c49d4b947..14f3f9f81c 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("15.1.22")
+ VERSION = Chef::VersionString.new("15.1.25")
end
#
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 1bdb7e9d80..19242db542 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -32,7 +32,7 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
aws-eventstream (1.0.3)
- aws-partitions (1.177.0)
+ aws-partitions (1.178.0)
aws-sdk-core (3.56.0)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index c5655f9acf..1ec6417074 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -4,7 +4,7 @@
#
# NOTE: You MUST update omnibus-software when adding new versions of
# software here: bundle exec rake dependencies:update_omnibus_gemfile_lock
-override :rubygems, version: "3.0.3"
+override :rubygems, version: "3.0.4"
override :bundler, version: "1.17.2" # currently pinned to what ships in Ruby to prevent double bundler
override "nokogiri", version: "1.10.2"
override "libffi", version: "3.2.1"
View Lorry Controller Status