summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ensure delete ENV[var] from current processjdmundrawala/testing-test-fixJay Mundrawala2014-10-161-2/+4
* More time!Jay Mundrawala2014-10-161-1/+3
* Retry delete envJay Mundrawala2014-10-161-4/+9
* Merge pull request #2215 from opscode/tball/homebrew_fixTyler Ball2014-10-133-2/+11
|\
| * Fixing bug where tried to use the homebrew provider on OSX and didn't correc...tball/homebrew_fixtyler-ball2014-10-133-2/+11
* | Merge pull request #2210 from opscode/sersut/contrib-passSerdar Sutay2014-10-132-1/+66
|\ \
| * | Fix the SLES version based on the existing logic.Serdar Sutay2014-10-131-2/+2
| * | Contribution information for https://github.com/opscode/chef/pull/2170.sersut/contrib-passSerdar Sutay2014-10-102-0/+8
| * | Contribution information for https://github.com/opscode/chef/pull/2187.Serdar Sutay2014-10-101-0/+2
| * | Contribution information for https://github.com/opscode/chef/pull/2203.Serdar Sutay2014-10-101-1/+4
| * | Contribution information for https://github.com/opscode/chef/pull/2167.Serdar Sutay2014-10-101-0/+2
| * | Contribution information for https://github.com/opscode/chef/pull/2164.Serdar Sutay2014-10-101-0/+2
| * | Contribution information for https://github.com/opscode/chef/pull/2149.Serdar Sutay2014-10-101-0/+2
| * | Contribution information for https://github.com/opscode/chef/pull/2079.Serdar Sutay2014-10-101-0/+2
| * | Contribution information for https://github.com/opscode/chef/pull/2165.Serdar Sutay2014-10-102-0/+9
| * | Contribution information for https://github.com/opscode/chef/pull/2052.Serdar Sutay2014-10-101-0/+2
| * | Contribution information for https://github.com/opscode/chef/pull/2051.Serdar Sutay2014-10-101-0/+3
| * | Contribution information for https://github.com/opscode/chef/pull/2041.Serdar Sutay2014-10-101-0/+2
| * | Contribution information for https://github.com/opscode/chef/pull/2013.Serdar Sutay2014-10-101-1/+2
| * | Contribution information for https://github.com/opscode/chef/pull/2207 (origi...Serdar Sutay2014-10-101-0/+2
| * | Contribution information for https://github.com/opscode/chef/pull/1957.Serdar Sutay2014-10-101-0/+2
| * | Contribution information for https://github.com/opscode/chef/pull/1924.Serdar Sutay2014-10-101-0/+2
| * | Contribution information for https://github.com/opscode/chef/pull/1914.Serdar Sutay2014-10-102-0/+7
| * | Contribution information for https://github.com/opscode/chef/pull/1907.Serdar Sutay2014-10-101-0/+2
| * | Contribution information for https://github.com/opscode/chef/pull/1827.Serdar Sutay2014-10-101-2/+2
| * | Contribution information for https://github.com/opscode/chef/pull/1724.Serdar Sutay2014-10-102-1/+7
| * | CHANGELOG update for https://github.com/opscode/chef/pull/2107.Serdar Sutay2014-10-101-0/+2
| * | CHANGELOG update for https://github.com/opscode/chef/pull/2129.Serdar Sutay2014-10-101-0/+4
* | | Merge pull request #2190 from opscode/jdmundrawala/issue-2169Jay Mundrawala2014-10-132-7/+7
|\ \ \ | |_|/ |/| |
| * | Try to apply dsc configuration even if what-if failsjdmundrawala/issue-2169Jay Mundrawala2014-10-082-7/+7
* | | Merge pull request #2208 from opscode/jdmundrawala/env-path-spec-fixJay Mundrawala2014-10-131-4/+3
|\ \ \
| * | | Deal with nil system path in env_specjdmundrawala/env-path-spec-fixJay Mundrawala2014-10-111-4/+1
| * | | restore ENV['PATH'] in env_spec after test is completeJay Mundrawala2014-10-101-1/+3
* | | | Merge pull request #2211 from opscode/sersut/rebase-chef-2187Serdar Sutay2014-10-102-3/+16
|\ \ \ \
| * \ \ \ Merge branch 'suse-group' of github.com:mapleoin/chefsersut/rebase-chef-2187Serdar Sutay2014-10-102-3/+16
| |\ \ \ \
| | * | | | change default group mapping for SLES to gpasswdIonuț Arțăriși2014-10-082-0/+14
* | | | | | Merge pull request #2207 from opscode/sersut/rebase-chef-1971Serdar Sutay2014-10-103-13/+27
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'patch-1' of github.com:workmad3/chef into sersut/rebase-chef-1971sersut/rebase-chef-1971Serdar Sutay2014-10-103-13/+27
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Ensuring no arguments interfere with testsDavid Workman2014-09-142-1/+4
| | * | | | Making sure the right data is used throughout the testDavid Workman2014-09-041-3/+4
| | * | | | Expanding the file name before checking existanceDavid Workman2014-09-041-2/+1
| | * | | | Fixing travis-ci failure.David Workman2014-09-042-1/+1
| | * | | | Fixing case of a nil recipe file with chef applyDavid Workman2014-09-032-10/+21
| | * | | | Update apply.rbDavid Workman2014-09-031-1/+1
* | | | | | Merge pull request #2170 from vaxvms/knife-status-json-outputSerdar Sutay2014-10-103-60/+168
|\ \ \ \ \ \
| * | | | | | Remove commented codeNicolas DUPEUX2014-10-071-3/+0
| * | | | | | Remove highline from status testNicolas Dupeux2014-10-061-2/+1
| * | | | | | Add JSON output to knife status commandNicolas Dupeux2014-10-062-58/+170
* | | | | | | Merge pull request #2203 from martinb3/masterSerdar Sutay2014-10-102-10/+57
|\ \ \ \ \ \ \
| * | | | | | | Adjust banner, error messagesMartin Smith2014-10-102-10/+17