Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | backport fix for part of CHEF-550, PL-343 roles-in-roles & 500 erroralpha_deploy_2_fix | Christopher Brown | 2010-05-13 | 1 | -1/+1 |
| | |||||
* | Adding solr version at 0.8.2alpha_deploy_3alpha_deploy_20.8.2 | Adam Jacob | 2010-02-28 | 1 | -1/+1 |
| | |||||
* | Bumping to version 0.8.2 for release | Adam Jacob | 2010-02-28 | 5 | -8/+12 |
| | |||||
* | Merge branch 'PL-455' of git://github.com/jtimberman/chef into jtimberman/PL-455 | Adam Jacob | 2010-02-27 | 1 | -19/+35 |
|\ | |||||
| * | PL-455, update the man page to reflect option changes. | jtimberman | 2010-02-26 | 1 | -19/+35 |
| | | |||||
* | | Ensuring we make 0600 for new keys | Adam Jacob | 2010-02-27 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PL-433' of git://github.com/skeptomai/chef into skeptomai/PL-433 | Adam Jacob | 2010-02-27 | 2 | -17/+22 |
|\ \ | |||||
| * | | increase the rest timeout to make client creation succeed under heavy load | Christopher Brown | 2010-02-26 | 1 | -1/+1 |
| | | | |||||
| * | | add debugging to 500 retry case | Christopher Brown | 2010-02-26 | 1 | -1/+2 |
| | | | |||||
| * | | PL-433 retry on 500 concurrency fixes | Christopher Brown | 2010-02-26 | 2 | -16/+20 |
| |\ \ | | |/ | |/| | |||||
| | * | retry on 500 from client create | Christopher Brown | 2010-02-25 | 2 | -16/+20 |
| | | | |||||
* | | | Merge branch 'CHEF-971' of git://github.com/nuoyan/chef into nuoyan/CHEF-971 | Adam Jacob | 2010-02-27 | 9 | -251/+186 |
|\ \ \ | |/ / |/| | | | | | | | | Conflicts: chef-server-webui/app/controllers/search.rb | ||||
| * | | fixing CHEF-969, 970, and 971 | Nuo Yan | 2010-02-26 | 8 | -20/+20 |
| | | | |||||
| * | | CHEF-971 | Nuo Yan | 2010-02-26 | 9 | -238/+174 |
| | | | |||||
* | | | Merge branch 'CHEF-990' of git://github.com/sdelano/chef into sdelano/CHEF-990 | Adam Jacob | 2010-02-26 | 5 | -3/+265 |
|\ \ \ | |||||
| * | | | CHEF-990: adding `knife (client/cookbook/role) bulk delete` spec tests | Stephen Delano | 2010-02-26 | 5 | -3/+265 |
| | | | | |||||
* | | | | Merge branch 'CHEF-989' of git://github.com/nuoyan/chef into nuoyan/CHEF-989 | Adam Jacob | 2010-02-26 | 7 | -25/+29 |
|\ \ \ \ | |||||
| * | | | | fixing CHEF-989, being able to show client in the search result, and also ↵ | Nuo Yan | 2010-02-26 | 7 | -25/+29 |
| | | | | | | | | | | | | | | | | | | | | fixing the colspan for all of the views | ||||
* | | | | | Merge branch 'CHEF-987' of git://github.com/thommay/chef into thommay/CHEF-987 | Adam Jacob | 2010-02-26 | 2 | -8/+45 |
|\ \ \ \ \ | |||||
| * | | | | | CHEF-987: allow yum to do localinstalls | Thom May | 2010-02-26 | 2 | -8/+45 |
| | | | | | | |||||
* | | | | | | Merge branch 'CHEF-988' of git://github.com/thommay/chef into thommay/CHEF-988 | Adam Jacob | 2010-02-26 | 2 | -5/+13 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | CHEF-988: Make yum only do updates if it don't got a version | Thom May | 2010-02-26 | 1 | -3/+4 |
| | | | | | | |||||
| * | | | | | add failing tests for CHEF-988 | Thom May | 2010-02-26 | 1 | -2/+9 |
| |/ / / / | |||||
* | | | | | Merge branch 'CHEF-986' of git://github.com/thommay/chef into thommay/CHEF-986 | Adam Jacob | 2010-02-26 | 2 | -8/+19 |
|\ \ \ \ \ | |||||
| * | | | | | CHEF-986: Ensure that we don't explode just because we chose the wrong action | Thom May | 2010-02-26 | 2 | -8/+19 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rpm install_package to check for an existing version and correctly install or upgrade Alias upgrade_package to install_package Update specs for rpm accordingly | ||||
* | | | | | Merge branch 'CHEF-951' of git://github.com/jtimberman/chef into ↵ | Adam Jacob | 2010-02-26 | 10 | -13/+268 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | jtimberman/CHEF-951 | ||||
| * | | | | | move -j to OPTIONS, for CHEF-951 | jtimberman | 2010-02-17 | 2 | -3/+3 |
| | | | | | | |||||
| * | | | | | use CHEF_USER/CHEF_GROUP instead to not clobber ENV, for CHEF-951 | jtimberman | 2010-02-17 | 10 | -20/+20 |
| | | | | | | |||||
| * | | | | | update server scripts for 0.8 changes, new indexer/search, fixes CHEF-951 | jtimberman | 2010-02-17 | 8 | -5/+260 |
| | | | | | | |||||
* | | | | | | Merge branch 'CHEF-985' of git://github.com/tfheen/chef into tfheen/CHEF-985 | Adam Jacob | 2010-02-26 | 3 | -3/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove unused search_index_path setting | Tollef Fog Heen | 2010-02-26 | 3 | -3/+0 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'CHEF-984' of git://github.com/tfheen/chef into tfheen/CHEF-984 | Adam Jacob | 2010-02-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Fix error in solr invocation, making it possible to override solr's data dir | Tollef Fog Heen | 2010-02-26 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'CHEF-975' of git://github.com/tfheen/chef into tfheen/CHEF-975 | Adam Jacob | 2010-02-26 | 2 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Secure the validation key as well. | Tollef Fog Heen | 2010-02-24 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Make sure client.pem is created securely | Tollef Fog Heen | 2010-02-24 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'CHEF-928' of git://github.com/mdkent/chef into mdkent/CHEF-928 | Adam Jacob | 2010-02-26 | 2 | -2/+751 |
|\ \ \ \ \ \ | |||||
| * | | | | | | CHEF-928: Drop the use of blank?, as provided by extlib/blank.rb, in determining | Matthew Kent | 2010-02-23 | 2 | -2/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if values should be overwritten. Causes some difficult to track down hash merge issues when extlib is loaded. Add specs to cover the expected behaviour. | ||||
| * | | | | | | CHEF-928: Import updated tests from the original deep_merge and add some Chef | Matthew Kent | 2010-02-22 | 1 | -0/+720 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | specific specs. | ||||
* | | | | | | Merge branch 'CHEF-957' of git://github.com/jzimmek/chef into jzimmek/CHEF-957 | Adam Jacob | 2010-02-26 | 1 | -0/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | setup arch specific defaults | Jan Zimmek | 2010-02-19 | 1 | -0/+8 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'CHEF-949' of git://github.com/jzimmek/chef into jzimmek/CHEF-949 | Adam Jacob | 2010-02-26 | 2 | -0/+442 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | arch specific service provider | Jan Zimmek | 2010-02-19 | 2 | -0/+442 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'CHEF-948' of git://github.com/jzimmek/chef into jzimmek/CHEF-948 | Adam Jacob | 2010-02-26 | 4 | -0/+407 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | add pacman provider and resource | Jan Zimmek | 2010-02-16 | 4 | -0/+407 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'CHEF-944' of git://github.com/jtimberman/chef into ↵ | Adam Jacob | 2010-02-26 | 1 | -0/+201 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | jtimberman/CHEF-944 | ||||
| * | | | | | | | | add LICENSE file in chef-solr, fixes CHEF-944 | jtimberman | 2010-02-12 | 1 | -0/+201 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'CHEF-943' of git://github.com/jtimberman/chef into ↵ | Adam Jacob | 2010-02-26 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | jtimberman/CHEF-943 | ||||
| * | | | | | | | | add ssh via query to knife man page, fixes CHEF-943 | jtimberman | 2010-02-12 | 1 | -11/+0 |
| |/ / / / / / / | |||||
| * | | | | | | | add ssh via query to knife man page | jtimberman | 2010-02-12 | 1 | -0/+11 |
| |/ / / / / / |