Merge branch 'master' into tduffield/fix-syntax

8 files changed, 26 insertions, 17 deletions

diff --git a/.travis.yml b/.travis.yml
index 5460516710..ed7fffc22b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,11 @@ cache: bundler
 # Early warning system to catch if Rubygems breaks something
 before_install:
   - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
+  - gem --version
+  - gem uninstall bundler -a -x
+  - rvm @global do gem uninstall bundler -a -x
   - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
+  - bundle --version
   - rm -f .bundle/config
 
 bundler_args: --without changelog development docgen guard maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
@@ -81,6 +85,8 @@ matrix:
     # The chefspec tests + bundler cache + "gem update --system" interact badly :/
     # (Cucumber doesn't start.)
     before_install:
+      - gem uninstall bundler -a -x
+      - rvm @global do gem uninstall bundler -a -x
       - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
       - bundle config --local without server:docgen:maintenance:omnibus_package:development:ruby_prof:pry
     script: tasks/bin/run_external_test $TEST_GEM rake
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee933457a8..93f3013682 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 This changelog reflects the current state of chef's master branch on github and may not reflect the current released version of chef, which is [![Gem Version](https://badge.fury.io/rb/chef.svg)](https://badge.fury.io/rb/chef).
 
-## [v12.18.47](https://github.com/chef/chef/tree/v12.18.47) (2017-01-23)
-[Full Changelog](https://github.com/chef/chef/compare/v12.17.44...v12.18.47)
+## [v12.18.48](https://github.com/chef/chef/tree/v12.18.48) (2017-01-24)
+[Full Changelog](https://github.com/chef/chef/compare/v12.17.44...v12.18.48)
 
 **Implemented enhancements:**
 
@@ -9,19 +9,25 @@ This changelog reflects the current state of chef's master branch on github and
 - yum\_repository: Allow baseurl to be an array & allow fastestmirror\_enabled false [\#5708](https://github.com/chef/chef/pull/5708) ([tas50](https://github.com/tas50))
 - Added module\_version attribute for dsc\_resource for SxS support [\#5701](https://github.com/chef/chef/pull/5701) ([Aliasgar16](https://github.com/Aliasgar16))
 - Adding returns property to chocolatey\_package resource [\#5688](https://github.com/chef/chef/pull/5688) ([Vasu1105](https://github.com/Vasu1105))
+- Bump net-ssh to v4, add dependencies for ed25519 support [\#5687](https://github.com/chef/chef/pull/5687) ([onlyhavecans](https://github.com/onlyhavecans))
+- Initial habitat plan for chef-client [\#5677](https://github.com/chef/chef/pull/5677) ([adamhjk](https://github.com/adamhjk))
+- cleanup of ifconfig and route providers [\#5676](https://github.com/chef/chef/pull/5676) ([lamont-granquist](https://github.com/lamont-granquist))
 - Code cleanup in the user provider [\#5674](https://github.com/chef/chef/pull/5674) ([lamont-granquist](https://github.com/lamont-granquist))
 - Code cleanup in the group provider [\#5673](https://github.com/chef/chef/pull/5673) ([lamont-granquist](https://github.com/lamont-granquist))
 - Core: Formally deprecate run\_command [\#5666](https://github.com/chef/chef/pull/5666) ([lamont-granquist](https://github.com/lamont-granquist))
 - Set MSI Scheduled Task name to match chef-client cookbook managed name [\#5657](https://github.com/chef/chef/pull/5657) ([mwrock](https://github.com/mwrock))
+- \[cheffs\] Don't iterate parent object on exist? call [\#5648](https://github.com/chef/chef/pull/5648) ([stevendanna](https://github.com/stevendanna))
 - Core: Remove Chef::Platform::HandlerMap [\#5636](https://github.com/chef/chef/pull/5636) ([lamont-granquist](https://github.com/lamont-granquist))
 - Core: Properly deprecate old Chef::Platform methods [\#5631](https://github.com/chef/chef/pull/5631) ([lamont-granquist](https://github.com/lamont-granquist))
 
 **Fixed bugs:**
 
+- Ensure ssh search paginates correctly [\#5744](https://github.com/chef/chef/pull/5744) ([thommay](https://github.com/thommay))
 - Do not modify File's new\_resource during why-run [\#5742](https://github.com/chef/chef/pull/5742) ([scottopherson](https://github.com/scottopherson))
 - Add gems for ECC algorithm support to omnibus. [\#5736](https://github.com/chef/chef/pull/5736) ([rhass](https://github.com/rhass))
 - Core: fix node attribute "unless" API methods [\#5717](https://github.com/chef/chef/pull/5717) ([lamont-granquist](https://github.com/lamont-granquist))
 - Fix error thrown by solo when run on Windows as SYSTEM [\#5693](https://github.com/chef/chef/pull/5693) ([scottopherson](https://github.com/scottopherson))
+- Remove non-working documention statements/arguments. [\#5684](https://github.com/chef/chef/pull/5684) ([ronabop](https://github.com/ronabop))
 - Report a blank resource if sensitive is enabled [\#5668](https://github.com/chef/chef/pull/5668) ([afiune](https://github.com/afiune))
 - Ensure node.docker? returns boolean [\#5645](https://github.com/chef/chef/pull/5645) ([andrewjamesbrown](https://github.com/andrewjamesbrown))
 - Fix Data Collector organization parsing regex [\#5630](https://github.com/chef/chef/pull/5630) ([adamleff](https://github.com/adamleff))
diff --git a/Gemfile.lock b/Gemfile.lock
index 7fd39d1d31..601a142dc6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,10 +47,10 @@ GIT
 PATH
   remote: .
   specs:
-    chef (12.18.47)
+    chef (12.18.48)
       addressable
       bundler (>= 1.10)
-      chef-config (= 12.18.47)
+      chef-config (= 12.18.48)
       chef-zero (>= 4.8)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -76,10 +76,10 @@ PATH
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef (12.18.47-universal-mingw32)
+    chef (12.18.48-universal-mingw32)
       addressable
       bundler (>= 1.10)
-      chef-config (= 12.18.47)
+      chef-config (= 12.18.48)
       chef-zero (>= 4.8)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -120,7 +120,7 @@ PATH
 PATH
   remote: chef-config
   specs:
-    chef-config (12.18.47)
+    chef-config (12.18.48)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index e3c12dc72f..d9c33dc769 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -6,16 +6,13 @@ _This file holds "in progress" release notes for the current release under devel
 
 - You can now specify the acceptable return codes from the chocolatey_package resource using the returns property.
 - You can now enable chef-client to run as a scheduled task directly from the client MSI on Windows hosts.
+- The package provider now supports DNF packages for Fedora and upcoming RHEL releases
 
 ## Highlighted bug fixes for this release:
 
-- Fixed exposure of sensitive data of resources marked as sensitive inside Reporting. Before you
-  were able to see the sensitive data on the Run History tab in the Chef Manage Console. Now we
-  are sending a new blank resource if the resource is marked as sensitive, this way we will not
-  compromise any sensitive data.
+- Fixed exposure of sensitive data of resources marked as sensitive inside Reporting. Before you were able to see the sensitive data on the Run History tab in the Chef Manage Console. Now we are sending a new blank resource if the resource is marked as sensitive, this way we will not compromise any sensitive data.
 
-  _Note: Old data that was already sent to Reporting marked as sensitive will continue to be
-  displayed. Apologies._
+  _Note: Old data that was already sent to Reporting marked as sensitive will continue to be displayed. Apologies._
 
 ## New deprecations introduced in this release:
 
diff --git a/VERSION b/VERSION
index 573755f47c..dc77386ad7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.18.47
\ No newline at end of file
+12.18.48
\ 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 7782acdd18..d1f8ca2b3f 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 = "12.18.47"
+  VERSION = "12.18.48"
 end
 
 #
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0aaec195f8..8d2f397214 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -21,7 +21,7 @@
 
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "12.18.47"
+  VERSION = "12.18.48"
 end
 
 #
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 909ecc0089..69af8dbd44 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -1,5 +1,5 @@
 # DO NOT EDIT. Generated by "rake dependencies". Edit version_policy.rb instead.
-override :rubygems, version: "2.6.9"
+override :rubygems, version: "2.6.10"
 override :bundler, version: "1.12.5"
 override :rainbow, version: "2.1.0"
 override "libffi", version: "3.2.1"