summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into HEAD8.2.0Jay Mundrawala2015-03-2512-411/+18
|\
| * Merge pull request #509 from chef/jdm/8.2.0Jay Mundrawala2015-03-252-1/+4
| |\
| | * Bump version for 8.2.0jdm/8.2.0Jay Mundrawala2015-03-241-1/+1
| | * Update CHANGELOG for 8.2.0Jay Mundrawala2015-03-241-0/+3
| |/
| * Changelog updateBryan McLellan2015-03-191-0/+4
| * Remove redundant if statementManiacal2015-03-191-3/+1
| * Reverting #354 because change bring in GPLv3 dependencyjdm/354Jay Mundrawala2015-03-187-404/+0
| * Merge pull request #505 from chef/lcg/drop-travis-193Lamont Granquist2015-03-181-1/+0
| |\
| | * remove 1.9.3 from travisLamont Granquist2015-03-171-1/+0
| |/
| * Merge pull request #502 from chef/lcg/bump-ffi-yajlLamont Granquist2015-03-171-1/+1
| |\
| | * bumping ffi-yajl to pick up 2.xlcg/bump-ffi-yajlLamont Granquist2015-03-171-1/+1
| |/
| * Merge pull request #495 from cmluciano/cml/addtravisbadgeLamont Granquist2015-03-161-1/+4
| |\
| | * Add appveyor badge for build status to readmecmluciano2015-03-111-0/+2
| | * Add travis badge for build status to readmecmluciano2015-03-111-1/+2
| |/
| * Merge pull request #490 from chef/jdm/fasterJay Mundrawala2015-02-281-0/+4
| |\
| | * Try to use travis container thingysjdm/fasterJay Mundrawala2015-02-171-0/+4
| |/
* | Merge branch 'master' into 8-stable8.1.1Jay Mundrawala2015-02-176-3/+11
|\ \ | |/
| * Bump version to 8.1.1Jay Mundrawala2015-02-171-1/+1
| * Update CHANGELOG for 8.1.1Jay Mundrawala2015-02-171-0/+3
| * Merge pull request #489 from chef/jdm/fixJay Mundrawala2015-02-174-2/+7
| |\
| | * Don't redefine constant that causes warningJay Mundrawala2015-02-171-1/+1
| | * Need to require ipaddressJay Mundrawala2015-02-171-0/+2
| | * Travis.yml should run ohaiJay Mundrawala2015-02-171-1/+3
| | * Appveyor should run ohaiJay Mundrawala2015-02-171-0/+1
| |/
* | Merge remote-tracking branch 'origin/master' into 8-stableJay Mundrawala2015-02-171-0/+3
|\ \ | |/
| * Fix changelogJay Mundrawala2015-02-171-0/+3
* | Merge remote-tracking branch 'origin/master' into HEAD8.1.0Jay Mundrawala2015-02-171-1/+1
|\ \ | |/
| * Merge pull request #486 from chef/jdm/version-bump-8.1Jay Mundrawala2015-02-171-1/+1
| |\
| | * Bump version to 8.1.0Jay Mundrawala2015-02-171-1/+1
| |/
* | Merge pull request #485 from chef/jdm/merge-into-8-stableJay Mundrawala2015-02-1737-139/+1431
|\ \ | |/
| * Merge pull request #484 from chef/jdm/merge-into-masterJay Mundrawala2015-02-171-1/+1
| |\
| | * Merge remote-tracking branch 'origin/8-stable' into HEADJay Mundrawala2015-02-171-1/+1
| | |\ | |/ / | | / | |/ |/|
* | Merge pull request #465 from chef/jdm/appveyor-8-stableJay Mundrawala2015-01-221-0/+32
|\ \
| * | Rename buildJay Mundrawala2015-01-221-1/+1
| * | Added appveyor.ymlJay Mundrawala2015-01-221-0/+32
|/ /
* | bumping version to 8.0.1Lamont Granquist2014-12-031-1/+1
* | restrict to ruby >= 2.0.0 to match chef8.0.1Lamont Granquist2014-12-031-0/+2
* | add require resolv to work around missing constant issue in cvt testersLamont Granquist2014-12-031-0/+2
| * Update CHANGELOG.md for contributionsBryan McLellan2015-02-171-1/+11
| * add extra metadata passed in from hints in knife-linodeJosh Blancett2015-02-171-0/+1
| * Fix up incorrect cloudstack metadataAlexey Karpik2015-02-175-16/+39
| * block_device rotational keyEric G. Wolfe2015-02-171-0/+5
| * Add a trailing dot to avoid using search option in resolv.confJose Luis Salas2015-02-171-1/+2
| * get kernel version as platform version for archlinuxRyan Chipman2015-02-172-0/+15
| * Support IBM System z s390 cpushuo zhang2015-02-173-37/+135
| * Fix GitHub Issue #432Jeff Goldschrafe2015-02-172-26/+57
| * Update CHANGELOG.md for contributionsBryan McLellan2015-02-171-0/+10
| * support for detecting if inside docker container.paulczar2015-02-172-24/+137
| * fix network on coreos/gentooMichael Schmidt2015-02-172-5/+18
| * Update mime-types dep to ~> 2.0Bryan McLellan2015-02-171-1/+1
View Lorry Controller Status