summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add missing requires to HTTP and HTTP::Simplehttp-simple-requiresdanielsdeleo2014-06-272-1/+4
* Merge pull request #1572 from opscode/sersut/ffi-comp-ohaiSerdar Sutay2014-06-271-1/+1
|\
| * Pick the ffi version compliant ohai version.sersut2014-06-271-1/+1
|/
* Version bump after branching 11.14.0 -> 11-stable.sersut2014-06-273-37/+76
* Merge pull request #1560 from opscode/sersut/chef-1549Serdar Sutay2014-06-261-1/+2
|\
| * add a comment about incompatible architecturesBryan McLellan2014-06-261-0/+1
| * Only check WOW64 process when system architecture is x64.sersut2014-06-251-1/+1
* | Contribution info for https://github.com/opscode/chef/pull/1414.sersut2014-06-261-0/+4
* | Merge pull request #1414 from vtolstov/upstreamSerdar Sutay2014-06-266-0/+269
|\ \
| * | remove named groups in regexpVasiliy Tolstov2014-06-221-4/+4
| * | remove unneded require chef/mixin/commandVasiliy Tolstov2014-06-161-1/+0
| * | remove failed testVasiliy Tolstov2014-06-161-13/+0
| * | fix last failed testsVasiliy Tolstov2014-06-151-1/+1
| * | fix last failed testsVasiliy Tolstov2014-06-151-2/+9
| * | fix testVasiliy Tolstov2014-06-141-180/+27
| * | fix determine installed packagesVasiliy Tolstov2014-06-141-1/+1
| * | fix determine installed packagesVasiliy Tolstov2014-06-141-7/+5
| * | fix parse of packege/version/repoVasiliy Tolstov2014-06-141-12/+18
| * | fix parse of packege/version/repoVasiliy Tolstov2014-06-141-8/+12
| * | fix testsVasiliy Tolstov2014-06-131-2/+2
| * | fix detection of accounts and installed-accounts packagesVasiliy Tolstov2014-06-131-0/+2
| * | fix load_current_resourceVasiliy Tolstov2014-05-201-1/+1
| * | add paludis package manager user in gentoo/exherbo linuxVasiliy Tolstov2014-05-136-0/+419
* | | Merge pull request #1564 from opscode/mcquin/yum-dump-parser-paramsClaire McQuin2014-06-261-1/+1
|\ \ \ | |_|/ |/| |
| * | Change --yum-lock-timeout option action to store.mcquin/yum-dump-parser-paramsClaire McQuin2014-06-261-1/+1
|/ /
* | Merge pull request #1520 from curiositycasualty/knife-ssh-identity-fileSerdar Sutay2014-06-251-0/+5
|\ \
| * | Allow csshX to respect identity_filecuriositycasualty2014-06-191-0/+5
* | | Merge pull request #1547 from juliandunn/confusing-json-commentSerdar Sutay2014-06-251-1/+0
|\ \ \
| * | | Remove confusing gemspec comment about the no-longer-used json gemJulian C. Dunn2014-06-251-1/+0
|/ / /
* | | Merge pull request #1525 from opscode/mcquin/chefdk-69Claire McQuin2014-06-244-8/+24
|\ \ \
| * | | Update for new FFI binding.Claire McQuin2014-06-241-0/+1
| * | | include module on windows onlyClaire McQuin2014-06-191-4/+2
| * | | Use FFI binders to attach :SendMessageTimeout instead of Win32API in order to...sersut2014-06-193-6/+23
* | | | Merge pull request #1528 from opscode/sersut/bump-ffi-versionSerdar Sutay2014-06-245-10/+12
|\ \ \ \
| * | | | Misc spec fixes for windows.sersut2014-06-242-4/+6
| * | | | Fix windows specs.sersut2014-06-241-2/+2
| * | | | Use FFI::LastError instead of GetLastError for ffi 1.9.x compatibility.sersut2014-06-242-6/+6
| * | | | Bump ffi version since chef-dk depends on chef and dep-selector and dep-selec...sersut2014-06-241-1/+1
|/ / / /
* | | | Merge pull request #1540 from opscode/lcg/ffi-yajl-gemlamont-granquist2014-06-249-29/+19
|\ \ \ \
| * | | | remove another commentLamont Granquist2014-06-241-2/+0
| * | | | remove commented linesLamont Granquist2014-06-231-2/+0
| * | | | we can still emit JSON::ParserErrors in compat modeLamont Granquist2014-06-232-2/+2
| * | | | fix another Yajl referenceLamont Granquist2014-06-231-2/+2
| * | | | convert to using ffi_yajlLamont Granquist2014-06-231-1/+3
| * | | | replace yajl and json gem with ffi-yajlLamont Granquist2014-06-236-24/+16
|/ / / /
* | | | Merge pull request #1530 from opscode/btm/CHEF-5158Bryan McLellan2014-06-223-21/+18
|\ \ \ \
| * | | | CHEF-5158: Contribution notesBryan McLellan2014-06-201-1/+2
| * | | | CHEF-5158: Add some debugging information for knife ssh attributeBryan McLellan2014-06-201-0/+3
| * | | | CHEF-5158: Make the former override_attribute's purpose a bit more clearBryan McLellan2014-06-202-18/+12
| * | | | [CHEF-5158] knife[:attribute] in knife.rb should not override --attribute in ...Hui Hu2014-06-202-3/+2