| Commit message (Expand) | Author | Age | Files | Lines |
* | attribute deep_merge to Steve Midgley in NOTICE | Daniel DeLeo | 2010-02-08 | 2 | -4/+5 |
* | no need to monkey patch Hash or Mash with deep_merge | Daniel DeLeo | 2010-02-08 | 1 | -32/+5 |
* | import deep_merge from danielsdeleo/deep_merge | Daniel DeLeo | 2010-02-08 | 1 | -1/+219 |
* | Fixes CHEF-922, proper attribute usage for ssh hostnames | Adam Jacob | 2010-02-04 | 1 | -2/+4 |
* | Adding Web UI Rake Tasks | Adam Jacob | 2010-02-03 | 2 | -2/+37 |
* | Merge branch 'chef-918' of git://github.com/fujin/chef into fujin/chef-918 | Adam Jacob | 2010-02-03 | 1 | -0/+1 |
|\ |
|
| * | CHEF-918: solo can no longer download remote recipe tarballs | AJ Christensen | 2010-02-04 | 1 | -0/+1 |
* | | Merge branch 'CHEF-919' of git://github.com/jtimberman/chef into jtimberman/C... | Adam Jacob | 2010-02-03 | 1 | -0/+1 |
|\ \ |
|
| * | | add new dependency for merb-param-protection, fixes CHEF-919 | jtimberman | 2010-02-03 | 1 | -0/+1 |
| |/ |
|
* | | Merge branch 'CHEF-865' of git://github.com/algorist/chef into algorist/CHEF-865 | Adam Jacob | 2010-02-03 | 2 | -35/+48 |
|\ \ |
|
| * | | CHEF-865: Extending retry in Chef::REST to 403s | Chris Walters | 2010-02-03 | 2 | -35/+48 |
| |/ |
|
* | | Merge branch 'CHEF-898' of git://github.com/jtimberman/chef into jtimberman/C... | Adam Jacob | 2010-02-03 | 1 | -0/+1 |
|\ \ |
|
| * | | Add dependency on uuidtools (>=2.0.0), fixes CHEF-898 | jtimberman | 2010-01-28 | 1 | -0/+1 |
* | | | Making is_running and accessor, fixing specs | Adam Jacob | 2010-02-03 | 2 | -4/+8 |
* | | | Merge branch 'CHEF-859' of git://github.com/spheromak/chef into spheromak/CHE... | Adam Jacob | 2010-02-03 | 2 | -80/+135 |
|\ \ \
| |_|/
|/| | |
|
| * | | updated route to set @new_resource.updated properly. | Jesse Nelson | 2010-01-28 | 1 | -1/+3 |
| * | | route files should be route-interface not route.interface | Jesse Nelson | 2010-01-26 | 1 | -1/+1 |
| * | | Merge branch 'master' of git://github.com/opscode/chef into CHEF-859 | root | 2010-01-16 | 10 | -39/+155 |
| |\ \ |
|
| * | | | fixed bug CHEF-859 | Jesse Nelson | 2010-01-14 | 2 | -80/+133 |
* | | | | Adding couchdb=nil to create_design_document | Adam Jacob | 2010-02-01 | 7 | -14/+16 |
| |_|/
|/| | |
|
* | | | Merge branch 'CHEF-897' of git://github.com/tfheen/chef into tfheen/CHEF-897 | Adam Jacob | 2010-01-27 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | When failing to find a package to install, tell which one. | Tollef Fog Heen | 2010-01-28 | 1 | -1/+1 |
* | | | | Merge branch 'CHEF-822' of git://github.com/tfheen/chef into tfheen/CHEF-822 | Adam Jacob | 2010-01-27 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | Give the same error message for wrong password and no such user | Tollef Fog Heen | 2010-01-27 | 1 | -1/+1 |
| |/ / / |
|
* | | | | Merge branch 'CHEF-900' of git://github.com/tfheen/chef into tfheen/CHEF-900 | Adam Jacob | 2010-01-27 | 1 | -8/+21 |
|\ \ \ \ |
|
| * | | | | Only admins can change the "is admin" bit. | Tollef Fog Heen | 2010-01-27 | 1 | -8/+21 |
| |/ / / |
|
* | | | | Merge branch 'CHEF-896' of git://github.com/mdkent/chef into mdkent/CHEF-896 | Adam Jacob | 2010-01-27 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | CHEF-896: Add file_backup_path prefix to log output. | Matthew Kent | 2010-01-25 | 1 | -1/+1 |
* | | | | | Merge branch 'CHEF-860' of git://github.com/nuoyan/chef into nuoyan/CHEF-860 | Adam Jacob | 2010-01-27 | 11 | -86/+203 |
|\ \ \ \ \ |
|
| * | | | | | moving the code block to check existing admin user to self.loaded | Nuo Yan | 2010-01-25 | 1 | -12/+8 |
| * | | | | | fixing typo in comment | Nuo Yan | 2010-01-25 | 1 | -1/+1 |
| * | | | | | Fixing CHEF-860, adding password masking, error handling, and fixed private k... | Nuo Yan | 2010-01-25 | 11 | -77/+198 |
| | |_|_|/
| |/| | | |
|
* | | | | | Merge branch 'CHEF-864' of git://github.com/danielsdeleo/chef into danielsdel... | Adam Jacob | 2010-01-27 | 2 | -27/+264 |
|\ \ \ \ \ |
|
| * | | | | | CHEF-864 WebUIUser must support the std "couchable" API | Dan DeLeo | 2010-01-16 | 2 | -27/+264 |
| | |_|_|/
| |/| | | |
|
* | | | | | Merge branch 'master' of git://github.com/commondream/chef into commondream/C... | Adam Jacob | 2010-01-27 | 1 | -3/+5 |
|\ \ \ \ \ |
|
| * | | | | | More replacing of the pattern. | Alan Johnson | 2010-01-15 | 1 | -1/+1 |
| * | | | | | Factored out the cron pattern so the code's a bit more maintainable. | Alan Johnson | 2010-01-15 | 1 | -2/+4 |
| * | | | | | Added operator support to cron provider (/ , and -). | Alan Johnson | 2010-01-15 | 1 | -1/+1 |
| |/ / / / |
|
* | | | | | Merge branch 'CHEF-805' of git://github.com/peritor/chef into peritor/CHEF-805 | Adam Jacob | 2010-01-27 | 2 | -2/+19 |
|\ \ \ \ \ |
|
| * | | | | | CHEF-805: Improved the deploy resource's scm_provider attribute to accept sym... | Mathias Meyer | 2010-01-16 | 2 | -2/+19 |
| | |/ / /
| |/| | | |
|
* | | | | | Merge branch 'CHEF-870' of git://github.com/tfheen/chef into tfheen/CHEF-870 | Adam Jacob | 2010-01-27 | 1 | -1/+1 |
|\ \ \ \ \
| |_|_|_|/
|/| | | | |
|
| * | | | | Reopen stdout and stderr, not stdout twice | Tollef Fog Heen | 2010-01-12 | 1 | -1/+1 |
| | |/ /
| |/| | |
|
* | | | | Merge branch 'CHEF-440' of git://github.com/tfheen/chef into tfheen/CHEF-440 | Adam Jacob | 2010-01-27 | 2 | -22/+9 |
|\ \ \ \ |
|
| * | | | | Make setting the run_list override it, not append to it | Tollef Fog Heen | 2010-01-08 | 2 | -22/+9 |
| |/ / / |
|
* | | | | Merge branch 'CHEF-866' of git://github.com/tfheen/chef into tfheen/CHEF-866 | Adam Jacob | 2010-01-27 | 1 | -0/+2 |
|\ \ \ \ |
|
| * | | | | Make @node and node available in attributes | Tollef Fog Heen | 2010-01-08 | 1 | -0/+2 |
| |/ / / |
|
* | | | | Merge branch 'CHEF-438' of git://github.com/tfheen/chef into tfheen/CHEF-438 | Adam Jacob | 2010-01-27 | 4 | -17/+52 |
|\ \ \ \ |
|
| * | | | | Add support for passing parameters to only_if/not_if | Tollef Fog Heen | 2010-01-08 | 4 | -17/+52 |
| |/ / / |
|
* | | | | Whitespace cleanup | Adam Jacob | 2010-01-26 | 1 | -1/+0 |
* | | | | Adding two seconds to the run interval feature, to avoid false negatives | Adam Jacob | 2010-01-26 | 1 | -1/+1 |