summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* backport fix for part of CHEF-550, PL-343 roles-in-roles & 500 erroralpha_deploy_2_fixChristopher Brown2010-05-131-1/+1
* Adding solr version at 0.8.2alpha_deploy_3alpha_deploy_20.8.2Adam Jacob2010-02-281-1/+1
* Bumping to version 0.8.2 for releaseAdam Jacob2010-02-285-8/+12
* Merge branch 'PL-455' of git://github.com/jtimberman/chef into jtimberman/PL-455Adam Jacob2010-02-271-19/+35
|\
| * PL-455, update the man page to reflect option changes.jtimberman2010-02-261-19/+35
* | Ensuring we make 0600 for new keysAdam Jacob2010-02-271-1/+1
* | Merge branch 'PL-433' of git://github.com/skeptomai/chef into skeptomai/PL-433Adam Jacob2010-02-272-17/+22
|\ \
| * | increase the rest timeout to make client creation succeed under heavy loadChristopher Brown2010-02-261-1/+1
| * | add debugging to 500 retry caseChristopher Brown2010-02-261-1/+2
| * | PL-433 retry on 500 concurrency fixesChristopher Brown2010-02-262-16/+20
| |\ \ | | |/ | |/|
| | * retry on 500 from client createChristopher Brown2010-02-252-16/+20
* | | Merge branch 'CHEF-971' of git://github.com/nuoyan/chef into nuoyan/CHEF-971Adam Jacob2010-02-279-251/+186
|\ \ \ | |/ / |/| |
| * | fixing CHEF-969, 970, and 971Nuo Yan2010-02-268-20/+20
| * | CHEF-971Nuo Yan2010-02-269-238/+174
* | | Merge branch 'CHEF-990' of git://github.com/sdelano/chef into sdelano/CHEF-990Adam Jacob2010-02-265-3/+265
|\ \ \
| * | | CHEF-990: adding `knife (client/cookbook/role) bulk delete` spec testsStephen Delano2010-02-265-3/+265
* | | | Merge branch 'CHEF-989' of git://github.com/nuoyan/chef into nuoyan/CHEF-989Adam Jacob2010-02-267-25/+29
|\ \ \ \
| * | | | fixing CHEF-989, being able to show client in the search result, and also fix...Nuo Yan2010-02-267-25/+29
* | | | | Merge branch 'CHEF-987' of git://github.com/thommay/chef into thommay/CHEF-987Adam Jacob2010-02-262-8/+45
|\ \ \ \ \
| * | | | | CHEF-987: allow yum to do localinstallsThom May2010-02-262-8/+45
* | | | | | Merge branch 'CHEF-988' of git://github.com/thommay/chef into thommay/CHEF-988Adam Jacob2010-02-262-5/+13
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | CHEF-988: Make yum only do updates if it don't got a versionThom May2010-02-261-3/+4
| * | | | | add failing tests for CHEF-988Thom May2010-02-261-2/+9
| |/ / / /
* | | | | Merge branch 'CHEF-986' of git://github.com/thommay/chef into thommay/CHEF-986Adam Jacob2010-02-262-8/+19
|\ \ \ \ \
| * | | | | CHEF-986: Ensure that we don't explode just because we chose the wrong actionThom May2010-02-262-8/+19
| |/ / / /
* | | | | Merge branch 'CHEF-951' of git://github.com/jtimberman/chef into jtimberman/C...Adam Jacob2010-02-2610-13/+268
|\ \ \ \ \
| * | | | | move -j to OPTIONS, for CHEF-951jtimberman2010-02-172-3/+3
| * | | | | use CHEF_USER/CHEF_GROUP instead to not clobber ENV, for CHEF-951jtimberman2010-02-1710-20/+20
| * | | | | update server scripts for 0.8 changes, new indexer/search, fixes CHEF-951jtimberman2010-02-178-5/+260
* | | | | | Merge branch 'CHEF-985' of git://github.com/tfheen/chef into tfheen/CHEF-985Adam Jacob2010-02-263-3/+0
|\ \ \ \ \ \
| * | | | | | Remove unused search_index_path settingTollef Fog Heen2010-02-263-3/+0
* | | | | | | Merge branch 'CHEF-984' of git://github.com/tfheen/chef into tfheen/CHEF-984Adam Jacob2010-02-261-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix error in solr invocation, making it possible to override solr's data dirTollef Fog Heen2010-02-261-1/+1
| |/ / / / /
* | | | | | Merge branch 'CHEF-975' of git://github.com/tfheen/chef into tfheen/CHEF-975Adam Jacob2010-02-262-2/+2
|\ \ \ \ \ \
| * | | | | | Secure the validation key as well.Tollef Fog Heen2010-02-241-1/+1
| * | | | | | Make sure client.pem is created securelyTollef Fog Heen2010-02-241-1/+1
| |/ / / / /
* | | | | | Merge branch 'CHEF-928' of git://github.com/mdkent/chef into mdkent/CHEF-928Adam Jacob2010-02-262-2/+751
|\ \ \ \ \ \
| * | | | | | CHEF-928: Drop the use of blank?, as provided by extlib/blank.rb, in determiningMatthew Kent2010-02-232-2/+31
| * | | | | | CHEF-928: Import updated tests from the original deep_merge and add some ChefMatthew Kent2010-02-221-0/+720
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'CHEF-957' of git://github.com/jzimmek/chef into jzimmek/CHEF-957Adam Jacob2010-02-261-0/+8
|\ \ \ \ \ \
| * | | | | | setup arch specific defaultsJan Zimmek2010-02-191-0/+8
* | | | | | | Merge branch 'CHEF-949' of git://github.com/jzimmek/chef into jzimmek/CHEF-949Adam Jacob2010-02-262-0/+442
|\ \ \ \ \ \ \
| * | | | | | | arch specific service providerJan Zimmek2010-02-192-0/+442
| |/ / / / / /
* | | | | | | Merge branch 'CHEF-948' of git://github.com/jzimmek/chef into jzimmek/CHEF-948Adam Jacob2010-02-264-0/+407
|\ \ \ \ \ \ \
| * | | | | | | add pacman provider and resourceJan Zimmek2010-02-164-0/+407
* | | | | | | | Merge branch 'CHEF-944' of git://github.com/jtimberman/chef into jtimberman/C...Adam Jacob2010-02-261-0/+201
|\ \ \ \ \ \ \ \
| * | | | | | | | add LICENSE file in chef-solr, fixes CHEF-944jtimberman2010-02-121-0/+201
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'CHEF-943' of git://github.com/jtimberman/chef into jtimberman/C...Adam Jacob2010-02-260-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | add ssh via query to knife man page, fixes CHEF-943jtimberman2010-02-121-11/+0
| |/ / / / / / /
| * | | | | | | add ssh via query to knife man pagejtimberman2010-02-121-0/+11
| |/ / / / / /