summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Replace \d,\d correctlysolaris_diff_problemsjkeiser2013-01-211-9/+9
* Even out some differences in Solaris diffjkeiser2013-01-211-21/+22
* Merge branch 'CHEF-3571'danielsdeleo2013-01-176-3/+273
|\
| * [CHEF-3571] update gemspec for chef-recipe -> chef-applydanielsdeleo2013-01-171-1/+1
| * [CHEF-3571] code rename chef-recipe -> chef-applydanielsdeleo2013-01-173-8/+8
| * [CHEF-3571] file rename chef-recipe -> chef-applydanielsdeleo2013-01-174-2/+2
| * CHEF-3571 add chef-recipe commandBryan Berry2013-01-176-3/+273
|/
* fix knife functional testsdanielsdeleo2013-01-161-1/+5
* Merge branch 'CHEF-3497'danielsdeleo2013-01-167-44/+131
|\
| * [CHEF-3497] Require mixlib-cli ~> 1.3.0danielsdeleo2013-01-161-1/+1
| * [CHEF-3497] apply config in the desired orderdanielsdeleo2013-01-145-29/+90
| * [CHEF-3497] don't configure in Knife#initializedanielsdeleo2013-01-141-2/+2
| * Update stubbing order within config specChris Roberts2013-01-142-8/+14
| * Isolate knife config file location methodology. Use new locate method when co...Chris Roberts2013-01-111-27/+38
| * Allow knife.rb configuration file to provide any options for knife pluginsChris Roberts2013-01-111-1/+10
|/
* Merge pull request #580 from opscode/lcg/tiny-server-racelamont-opscode2013-01-101-2/+2
|\
| * race condition that resolves itself?Lamont Granquist2013-01-101-2/+2
|/
* remove mistaken message expectationdanielsdeleo2013-01-071-1/+0
* Merge branch 'fix-reporting-tests-windows'danielsdeleo2013-01-073-16/+40
|\
| * Make tests unix_only where the stubs don't work on windows.danielsdeleo2013-01-071-3/+13
| * Add missing stubs for File.directory?("/tmp")danielsdeleo2013-01-071-0/+2
| * Stub windows platform detection in spec testsdanielsdeleo2013-01-072-13/+22
| * Stub windows detection in directory spec.danielsdeleo2013-01-071-0/+3
|/
* update rspec dependency to 2.12.xdanielsdeleo2013-01-071-1/+1
* Merge branch 'functional-test-context-fix'danielsdeleo2013-01-074-38/+46
|\
| * fix functional test context for permissions.danielsdeleo2013-01-074-38/+46
|/
* skip windows reporting functional tests for nowdanielsdeleo2013-01-041-1/+5
* Fix dynamic inclusion of windows securable behaviordanielsdeleo2013-01-042-17/+19
* Fix remote file functional tests for ruby < 1.9.3danielsdeleo2013-01-041-1/+10
* Compute expected remote file mode from tempfiledanielsdeleo2013-01-041-1/+6
* Merge branch 'CHEF-3557-unix'danielsdeleo2013-01-0421-180/+613
|\
| * [CHEF-3557] report file modes with leading 0 for claritydanielsdeleo2013-01-045-13/+13
| * [CHEF-3557] force log_level to info to suppress diffsdanielsdeleo2013-01-041-0/+3
| * [CHEF-3557] Fix ws/capitalization in test suite/commentsdanielsdeleo2013-01-041-6/+6
| * [CHEF-3557] skip file metadata reporting on win for nowdanielsdeleo2013-01-031-0/+1
| * [CHEF-3557] fix reporting for directory-like resourcesdanielsdeleo2013-01-036-12/+13
| * [CHEF-3557] fix file security reporting for files on Unixdanielsdeleo2013-01-039-210/+390
| * [CHEF-3557] Fix tests after rebasedanielsdeleo2013-01-031-3/+3
| * [CHEF-3557] remove load_current_resource_attrs corpsedanielsdeleo2013-01-033-7/+13
| * [CHEF-3557] remove load_current_resource_attrsdanielsdeleo2013-01-036-160/+165
| * [CHEF-3557] Update ScanAccessControl behaviordanielsdeleo2013-01-032-6/+4
| * [CHEF-3557] Factor out windows security resource attrsdanielsdeleo2013-01-032-11/+37
| * [CHEF-3557] codify file metadata reporting behaviordanielsdeleo2013-01-031-0/+213
|/
* Merge branch 'CHEF-3681'danielsdeleo2012-12-274-21/+167
|\
| * [CHEF-3681] Test LWPs with inline compilationdanielsdeleo2012-12-272-0/+68
| * [CHEF-3681] cleanup whitespace in ResourceCollectiondanielsdeleo2012-12-271-21/+21
| * [CHEF-3681] define #empty? for resource_collectiondanielsdeleo2012-12-271-0/+4
| * [CHEF-3681] add inline compilation option for LWRPdanielsdeleo2012-12-271-0/+74
|/
* [CHEF-3724] correctly query the recipes attribute in Node#recipe?danielsdeleo2012-12-262-1/+31
* Merge pull request #567 from opscode/lcg/CHEF-3718lamont-opscode2012-12-211-0/+1
|\