summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* I missed a test0.7.0Adam Jacob2009-06-091-0/+1
* Merge branch 'master' into fujin/chef-353Adam Jacob2009-06-095-4/+67
|\
| * Updating changelog, changing version to 0.7.0Adam Jacob2009-06-095-4/+67
* | CHEF-353: Fix 'rake test' caching.AJ Christensen2009-06-101-6/+9
|/
* Adding a safety check for closing already closed filehandlesAdam Jacob2009-06-091-1/+1
* Merge branch 'master' into mdkent/chef-347Adam Jacob2009-06-093-1/+81
|\
| * CHEF-350: Make the solo application load JSON correctly.AJ Christensen2009-06-093-1/+81
* | Remove unused method.Matthew Kent2009-06-081-42/+1
|/
* Merge branch 'master' into fujin/chef-344Adam Jacob2009-06-081-1/+71
|\
| * Merge branch 'master' into jtimberman/cook-119Adam Jacob2009-06-0877-1154/+181
| |\
| * | Changes from mdkent/chef-repo/cook-119:jtimberman2009-06-041-1/+71
* | | CHEF-344: make rubygems work again, better logging in candidate_versionAJ Christensen2009-06-091-4/+4
| |/ |/|
* | CHEF-330: spec fixes :(AJ Christensen2009-06-091-4/+3
* | CHEF-330: Fix broken specs.AJ Christensen2009-06-082-8/+9
* | CHEF-330: looks like something broke in the rebase, specs work againAJ Christensen2009-06-082-17/+10
* | CHEF-330: Add verbose(r) error messages, specs; for JSON fetchingAJ Christensen2009-06-084-15/+137
* | Merge branch 'fujin/chef-345'Adam Jacob2009-06-073-3/+3
|\ \
| * | There is no indexer.rb - the indexer uses the server config by defaultAdam Jacob2009-06-071-1/+1
| * | CHEF-345: supply the correct values for 'default' option to mixlib-cliAJ Christensen2009-06-063-3/+3
* | | Merge branch 'master' into jtimberman/chef-338Adam Jacob2009-06-071-1/+4
|\ \ \
| * \ \ Merge branch 'master' into jtimberman/chef-342Adam Jacob2009-06-070-0/+0
| |\ \ \
| | * | | Revert "CHEF-330: make Solo work correctly again."Adam Jacob2009-06-043-122/+23
| | * | | CHEF-330: make Solo work correctly again.AJ Christensen2009-06-053-23/+122
| | |/ /
| * | | Its a tiny e in JSONEditor in this one too.jtimberman2009-06-051-1/+1
| * | | chef-342, add chef server config to config.ru, and we can remove same from ch...jtimberman2009-06-041-1/+4
| |/ /
* | | Its a tiny e in JSONEditor in this one too.jtimberman2009-06-051-1/+1
|/ /
* | Removing the example-repository, since it only leads to confusionAdam Jacob2009-06-0463-1132/+0
* | Adding metadata.json to the ignore listAdam Jacob2009-06-041-0/+1
* | Adding a Chef::Mixin::DeepMerge, so that we have the proper merge semanticsAdam Jacob2009-06-045-7/+47
|/
* Adding some clarifying text to the repo rakefile tasksAdam Jacob2009-06-041-1/+1
* Merge branch 'chef-337' of git://github.com/jtimberman/chef into jtimberman-c...Adam Jacob2009-06-041-9/+62
|\
| * bring rake tasks in line with canonical chef-repo's Rakefile, and create meta...jtimberman2009-06-041-2/+51
| * chef-337, update with changes in line with chef-repo rakefilejtimberman2009-06-041-7/+11
* | Updating the openid_consumer index to have a link to the wikiAdam Jacob2009-06-043-24/+26
* | Its a tiny e in JSONEditorAdam Jacob2009-06-041-2/+2
* | Using recipe? now asks both the run list and the seen_recipes listAdam Jacob2009-06-042-1/+18
* | Fixing the indexer to not modify a hash in an interatorAdam Jacob2009-06-041-7/+5
* | Removing the stub specs for chef-server-slice - use cucumber features instead.Adam Jacob2009-06-0420-397/+1
* | Updating the options for packages to no longer create extra spaces when optio...Adam Jacob2009-06-047-17/+22
* | Merge branch 'master' into cabeca/chef-327Adam Jacob2009-06-0415-65/+213
|\ \
| * | CHEF-296: openid_providers deprecation => authorized_openid_providersAJ Christensen2009-06-053-21/+46
| |/
| * Merge branch 'master' into mdkent/chef-323Adam Jacob2009-06-0435-118/+465
| |\
| | * Merge branch 'master' into mdkent/chef-310Adam Jacob2009-06-0435-118/+465
| | |\
| | | * Merge branch 'master' into mdkent/chef-331Adam Jacob2009-06-0442-156/+544
| | | |\
| | | | * Merge branch 'master' into fujin/chef-321Adam Jacob2009-06-0449-178/+698
| | | | |\
| | | | | * Merge branch 'master' into essh/chef-312Adam Jacob2009-06-0463-221/+845
| | | | | |\
| | | | | | * Merge branch 'master' into ctennis/chef-308Adam Jacob2009-06-0497-241/+1284
| | | | | | |\
| | | | | | | * Merge branch 'master' into andrewwillis/chef-307Adam Jacob2009-06-0463-217/+822
| | | | | | | |\
| | | | | | | | * Merge branch 'master' into ctennis/chef-298Adam Jacob2009-06-0496-241/+1282
| | | | | | | | |\
| | | | | | | | | * Merge branch 'master' into cabeca/chef-335Adam Jacob2009-06-0425-55/+332
| | | | | | | | | |\