Skip to content
  • danielsdeleo's avatar
    Merge branch '10-stable' into integrate-chef-10-18-0 · fe166ed1
    danielsdeleo authored
    Conflicts:
    	.gitattributes
    	chef-expander/Rakefile
    	chef-expander/lib/chef/expander/version.rb
    	chef-server-api/Rakefile
    	chef-server-api/chef-server-api.gemspec
    	chef-server-api/lib/chef-server-api/version.rb
    	chef-server-webui/Rakefile
    	chef-server-webui/chef-server-webui.gemspec
    	chef-server-webui/lib/chef-server-webui/version.rb
    	chef-server/Rakefile
    	chef-server/lib/chef-server/version.rb
    	chef-solr/lib/chef/solr/version.rb
    	chef.gemspec
    	chef/Rakefile
    	chef/spec/support/platform_helpers.rb
    	chef/spec/support/shared/functional/file_resource.rb
    	chef/spec/unit/api_client_spec.rb
    	chef/spec/unit/provider/directory_spec.rb
    	ci/jenkins_run_tests.bat
    	ci/jenkins_run_tests.sh
    	distro/common/html/chef-client.8.html
    	distro/common/html/chef-expander.8.html
    	distro/common/html/chef-expanderctl.8.html
    	distro/common/html/chef-server-webui.8.html
    	distro/common/html/chef-server.8.html
    	distro/common/html/chef-shell.1.html
    	distro/common/html/chef-solo.8.html
    	distro/common/html/chef-solr.8.html
    	distro/common/html/knife-bootstrap.1.html
    	distro/common/html/knife-client.1.html
    	distro/common/html/knife-configure.1.html
    	distro/common/html/knife-cookbook-site.1.html
    	distro/common/html/knife-cookbook.1.html
    	distro/common/html/knife-data-bag.1.html
    	distro/common/html/knife-environment.1.html
    	distro/common/html/knife-exec.1.html
    	distro/common/html/knife-index.1.html
    	distro/common/html/knife-node.1.html
    	distro/common/html/knife-role.1.html
    	distro/common/html/knife-search.1.html
    	distro/common/html/knife-ssh.1.html
    	distro/common/html/knife-status.1.html
    	distro/common/html/knife-tag.1.html
    	distro/common/html/knife.1.html
    	distro/common/man/man1/chef-shell.1
    	distro/common/man/man1/knife-bootstrap.1
    	distro/common/man/man1/knife-client.1
    	distro/common/man/man1/knife-configure.1
    	distro/common/man/man1/knife-cookbook-site.1
    	distro/common/man/man1/knife-cookbook.1
    	distro/common/man/man1/knife-data-bag.1
    	distro/common/man/man1/knife-environment.1
    	distro/common/man/man1/knife-exec.1
    	distro/common/man/man1/knife-index.1
    	distro/common/man/man1/knife-node.1
    	distro/common/man/man1/knife-role.1
    	distro/common/man/man1/knife-search.1
    	distro/common/man/man1/knife-ssh.1
    	distro/common/man/man1/knife-status.1
    	distro/common/man/man1/knife-tag.1
    	distro/common/man/man1/knife.1
    	distro/common/man/man8/chef-client.8
    	distro/common/man/man8/chef-expander.8
    	distro/common/man/man8/chef-expanderctl.8
    	distro/common/man/man8/chef-server-webui.8
    	distro/common/man/man8/chef-server.8
    	distro/common/man/man8/chef-solo.8
    	distro/common/man/man8/chef-solr.8
    	lib/chef/api_client.rb
    	lib/chef/rest.rb
    	lib/chef/version.rb
    	spec/functional/knife/ssh_spec.rb
    	spec/functional/resource/cookbook_file_spec.rb
    	spec/spec_helper.rb
    	spec/stress/win32/security_spec.rb
    	spec/support/shared/functional/securable_resource.rb
    	spec/unit/config_spec.rb
    	spec/unit/knife/ssh_spec.rb
    fe166ed1