summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use badge in CHANGELOGtduffield/tweak-changelogTom Duffield2016-12-051-1/+1
* Bump version of chef to 12.17.38 by Chef Versioner.v12.17.38Chef Versioner2016-12-055-11/+21
* Merge pull request #5614 from chef/lcg/fix-yum-regexpLamont Granquist2016-12-051-1/+1
|\
| * fix yum regexp similarly to rpm regexp in #3985lcg/fix-yum-regexpLamont Granquist2016-12-051-1/+1
|/
* Bump version of chef to 12.17.37 by Chef Versioner.v12.17.37Chef Versioner2016-12-055-10/+10
* Merge pull request #5609 from chef/tas50/newchefclientThom May2016-12-053-44/+64
|\
| * Update chef client testing depstas50/newchefclientTim Smith2016-12-023-44/+64
* | Bump version of chef to 12.17.36 by Chef Versioner.v12.17.36Chef Versioner2016-12-055-10/+10
* | Merge pull request #5607 from chef/adamleff/update-ohai-resourceThom May2016-12-053-29/+11
|\ \
| * | Update ohai resource to new style, stop overwriting name propertyadamleff/update-ohai-resourceAdam Leff2016-12-023-29/+11
* | | Bump version of chef to 12.17.35 by Chef Versioner.v12.17.35Chef Versioner2016-12-035-10/+11
* | | Merge pull request #5603 from ttr/masterTim Smith2016-12-022-2/+2
|\ \ \
| * | | linux mount spec - skip device detection for zfs (and vboxsf)Tomasz Rudzki (ttr)2016-12-011-1/+1
| * | | linux mount provider - skip device detection for zfsTomasz Rudzki (ttr)2016-12-011-1/+1
* | | | Bump version of chef to 12.17.34 by Chef Versioner.v12.17.34Chef Versioner2016-12-025-10/+10
* | | | Merge pull request #5610 from chef/tduffield/use-chef-docker-imageTom Duffield2016-12-021-4/+2
|\ \ \ \
| * | | | Use chef/chef image instead of downloading from packages.chef.ioTom Duffield2016-12-021-4/+2
| | |/ / | |/| |
* | | | Bump version of chef to 12.17.33 by Chef Versioner.v12.17.33Chef Versioner2016-12-025-9/+35
| |_|/ |/| |
* | | Merge pull request #5605 from chef/tduffield/use-modified-changelog-generatorTom Duffield2016-12-025-99/+112
|\ \ \ | |/ / |/| |
| * | Update Inspec in kitchen-teststduffield/use-modified-changelog-generatorTom Duffield2016-12-021-39/+39
| * | Use tduffield branch of github-changelog-generatorTom Duffield2016-12-024-60/+73
|/ /
* | Bump version of chef to 12.17.32 by Chef Versioner.v12.17.32Chef Versioner2016-12-014-8/+8
* | Merge pull request #5599 from shortdudey123/mount_action_unmountThom May2016-12-015-2/+21
|\ \
| * | Alias unmount to umount for mount resourceGrant Ridder2016-11-305-2/+21
| |/
* | Bump version of chef to 12.17.31 by Chef Versioner.v12.17.31Chef Versioner2016-12-014-8/+8
* | Merge pull request #5598 from chef/tm/streamline_maintainersThom May2016-12-012-60/+2
|\ \
| * | Remove Maintainer subsectionstm/streamline_maintainersThom May2016-11-302-60/+2
* | | Bump version of chef to 12.17.30 by Chef Versioner.v12.17.30Chef Versioner2016-12-014-8/+8
* | | Merge pull request #5602 from jerryaldrichiii/modify-knife-configure-messageThom May2016-12-013-4/+5
|\ \ \ | |_|/ |/| |
| * | Modify `knife configure` example `chef_server_url`Jerry Aldrich III2016-12-013-4/+5
|/ /
* | Bump version of chef to 12.17.29 by Chef Versioner.v12.17.29Chef Versioner2016-11-304-8/+8
* | Merge pull request #5591 from jugatsu/masterThom May2016-11-301-1/+1
|\ \
| * \ Merge pull request #1 from jugatsu/cab-dism-englishjugatsu2016-11-291-1/+1
| |\ \
| | * | Add support to cab_package for non-English system localesjugatsu2016-11-291-1/+1
| |/ /
* | | Bump version of chef to 12.17.28 by Chef Versioner.v12.17.28Chef Versioner2016-11-294-8/+8
* | | Merge pull request #5572 from jeunito/5436_multiple_deletefLamont Granquist2016-11-295-25/+55
|\ \ \ | |/ / |/| |
| * | remove trailing whitespaceJose Asuncion2016-11-291-1/+1
| * | update banners to reflect usageJose Asuncion2016-11-292-2/+2
| * | extract delete steps to its own methodJose Asuncion2016-11-291-9/+12
| * | Fix style issuesJose Asuncion2016-11-292-2/+2
| * | add multiple node deleteJose Asuncion2016-11-292-16/+25
| * | knife client delete should delete multiple nodesJose Asuncion2016-11-293-11/+29
* | | Bump version of chef to 12.17.27 by Chef Versioner.v12.17.27Chef Versioner2016-11-284-8/+8
* | | Merge pull request #5590 from chef/adamleff/use-chef-jsoncompatThom May2016-11-282-3/+2
|\ \ \
| * | | Update Data Collector to use Chef::JSONCompatAdam Leff2016-11-282-3/+2
|/ / /
* | | Bump version of chef to 12.17.26 by Chef Versioner.v12.17.26Chef Versioner2016-11-284-8/+8
* | | Merge pull request #5545 from chef/tduffield/add-dockerfileTom Duffield2016-11-281-0/+11
|\ \ \ | |/ / |/| |
| * | Use rpm2cpio and busybox to build Docker imagetduffield/add-dockerfileTom Duffield2016-11-181-5/+3
| * | Use centos:5 for DockerfileTom Duffield2016-11-171-9/+8
| * | Add Dockerfile to rootTom Duffield2016-11-151-0/+14