Merge branch 'master' into mp/WS-345

chef · Jul 9, 2020 · 7dc3393 · 7dc3393
2 parents 1d95b26 + 039b7bd
commit 7dc3393
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,15 +1,16 @@
 <!-- usage documentation: https://expeditor.chef.io/docs/reference/changelog/ -->
-<!-- latest_release 20.7.83 -->
-## [20.7.83](https://github.com/chef/chef-workstation/tree/20.7.83) (2020-07-08)
+<!-- latest_release 20.7.84 -->
+## [20.7.84](https://github.com/chef/chef-workstation/tree/20.7.84) (2020-07-09)
 
 #### Merged Pull Requests
-- Add the habitat binary to the Workstation package [#1288](https://github.com/chef/chef-workstation/pull/1288) ([marcparadise](https://github.com/marcparadise))
+- Bump cookstyle to 6.11.4 [#1332](https://github.com/chef/chef-workstation/pull/1332) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot]))
 <!-- latest_release -->
 
 <!-- release_rollup since=20.7.81 -->
 ### Changes since 20.7.81 release
 
 #### Merged Pull Requests
+- Bump cookstyle to 6.11.4 [#1332](https://github.com/chef/chef-workstation/pull/1332) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 20.7.84 -->
 - Add the habitat binary to the Workstation package [#1288](https://github.com/chef/chef-workstation/pull/1288) ([marcparadise](https://github.com/marcparadise)) <!-- 20.7.83 -->
 - Bump kitchen-ec2 to 3.7.0 [#1320](https://github.com/chef/chef-workstation/pull/1320) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 20.7.82 -->
 <!-- release_rollup -->

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-20.7.83
+20.7.84
diff --git a/components/gems/Gemfile.lock b/components/gems/Gemfile.lock
@@ -14,7 +14,7 @@ GEM
     artifactory (3.0.15)
     ast (2.4.1)
     aws-eventstream (1.1.0)
-    aws-partitions (1.338.0)
+    aws-partitions (1.341.0)
     aws-sdk-apigateway (1.48.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
@@ -33,13 +33,13 @@ GEM
     aws-sdk-cloudformation (1.41.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudfront (1.33.0)
+    aws-sdk-cloudfront (1.34.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-cloudhsm (1.24.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudhsmv2 (1.26.0)
+    aws-sdk-cloudhsmv2 (1.27.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-cloudtrail (1.26.0)
@@ -74,7 +74,7 @@ GEM
     aws-sdk-dynamodb (1.51.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.174.0)
+    aws-sdk-ec2 (1.176.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-ecr (1.34.0)
@@ -83,7 +83,7 @@ GEM
     aws-sdk-ecs (1.67.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-efs (1.32.0)
+    aws-sdk-efs (1.33.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-eks (1.39.0)
@@ -125,7 +125,7 @@ GEM
     aws-sdk-organizations (1.17.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-rds (1.92.0)
+    aws-sdk-rds (1.93.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-redshift (1.46.0)
@@ -140,7 +140,7 @@ GEM
     aws-sdk-route53resolver (1.17.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.73.0)
+    aws-sdk-s3 (1.74.0)
       aws-sdk-core (~> 3, >= 3.102.1)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -153,7 +153,7 @@ GEM
     aws-sdk-sms (1.23.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.27.0)
+    aws-sdk-sns (1.28.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-sqs (1.30.0)
@@ -174,13 +174,13 @@ GEM
       ms_rest_azure (~> 0.12.0)
     azure_mgmt_key_vault (0.17.6)
       ms_rest_azure (~> 0.12.0)
-    azure_mgmt_network (0.23.4)
+    azure_mgmt_network (0.24.0)
       ms_rest_azure (~> 0.12.0)
     azure_mgmt_resources (0.17.9)
       ms_rest_azure (~> 0.12.0)
     azure_mgmt_security (0.18.2)
       ms_rest_azure (~> 0.12.0)
-    azure_mgmt_storage (0.21.1)
+    azure_mgmt_storage (0.21.2)
       ms_rest_azure (~> 0.12.0)
     bcrypt_pbkdf (1.1.0.rc1)
     bcrypt_pbkdf (1.1.0.rc1-x64-mingw32)
@@ -341,8 +341,8 @@ GEM
       chef-cli
       fauxhai-ng (>= 7.5)
       rspec (~> 3.0)
-    chefstyle (1.1.2)
-      rubocop (= 0.86.0)
+    chefstyle (1.1.3)
+      rubocop (= 0.87.1)
     citrus (3.0.2)
     cleanroom (1.0.0)
     coderay (1.1.3)
@@ -351,8 +351,8 @@ GEM
     concurrent-ruby (1.1.6)
     cookbook-omnifetch (0.9.1)
       mixlib-archive (>= 0.4, < 2.0)
-    cookstyle (6.9.0)
-      rubocop (= 0.86.0)
+    cookstyle (6.11.4)
+      rubocop (= 0.87.1)
     debug_inspector (0.0.3)
     declarative (0.0.20)
     declarative-option (0.1.0)
@@ -502,7 +502,7 @@ GEM
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
     ipaddress (0.8.3)
-    iso8601 (0.12.2)
+    iso8601 (0.12.3)
     jmespath (1.4.0)
     json (2.3.1)
     json_schemer (0.2.11)
@@ -610,9 +610,9 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     little-plugger (1.1.4)
     lockfile (2.1.3)
-    logging (2.2.2)
+    logging (2.3.0)
       little-plugger (~> 1.1)
-      multi_json (~> 1.10)
+      multi_json (~> 1.14)
     lumberjack (1.2.6)
     mdl (0.9.0)
       kramdown (~> 2.0)
@@ -768,13 +768,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.86.0)
+    rubocop (0.87.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.0.3, < 1.0)
+      rubocop-ast (>= 0.1.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-ast (0.1.0)