summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* attribute deep_merge to Steve Midgley in NOTICEDaniel DeLeo2010-02-082-4/+5
* no need to monkey patch Hash or Mash with deep_mergeDaniel DeLeo2010-02-081-32/+5
* import deep_merge from danielsdeleo/deep_mergeDaniel DeLeo2010-02-081-1/+219
* Fixes CHEF-922, proper attribute usage for ssh hostnamesAdam Jacob2010-02-041-2/+4
* Adding Web UI Rake TasksAdam Jacob2010-02-032-2/+37
* Merge branch 'chef-918' of git://github.com/fujin/chef into fujin/chef-918Adam Jacob2010-02-031-0/+1
|\
| * CHEF-918: solo can no longer download remote recipe tarballsAJ Christensen2010-02-041-0/+1
* | Merge branch 'CHEF-919' of git://github.com/jtimberman/chef into jtimberman/C...Adam Jacob2010-02-031-0/+1
|\ \
| * | add new dependency for merb-param-protection, fixes CHEF-919jtimberman2010-02-031-0/+1
| |/
* | Merge branch 'CHEF-865' of git://github.com/algorist/chef into algorist/CHEF-865Adam Jacob2010-02-032-35/+48
|\ \
| * | CHEF-865: Extending retry in Chef::REST to 403sChris Walters2010-02-032-35/+48
| |/
* | Merge branch 'CHEF-898' of git://github.com/jtimberman/chef into jtimberman/C...Adam Jacob2010-02-031-0/+1
|\ \
| * | Add dependency on uuidtools (>=2.0.0), fixes CHEF-898jtimberman2010-01-281-0/+1
* | | Making is_running and accessor, fixing specsAdam Jacob2010-02-032-4/+8
* | | Merge branch 'CHEF-859' of git://github.com/spheromak/chef into spheromak/CHE...Adam Jacob2010-02-032-80/+135
|\ \ \ | |_|/ |/| |
| * | updated route to set @new_resource.updated properly.Jesse Nelson2010-01-281-1/+3
| * | route files should be route-interface not route.interfaceJesse Nelson2010-01-261-1/+1
| * | Merge branch 'master' of git://github.com/opscode/chef into CHEF-859root2010-01-1610-39/+155
| |\ \
| * | | fixed bug CHEF-859Jesse Nelson2010-01-142-80/+133
* | | | Adding couchdb=nil to create_design_documentAdam Jacob2010-02-017-14/+16
| |_|/ |/| |
* | | Merge branch 'CHEF-897' of git://github.com/tfheen/chef into tfheen/CHEF-897Adam Jacob2010-01-271-1/+1
|\ \ \
| * | | When failing to find a package to install, tell which one.Tollef Fog Heen2010-01-281-1/+1
* | | | Merge branch 'CHEF-822' of git://github.com/tfheen/chef into tfheen/CHEF-822Adam Jacob2010-01-271-1/+1
|\ \ \ \
| * | | | Give the same error message for wrong password and no such userTollef Fog Heen2010-01-271-1/+1
| |/ / /
* | | | Merge branch 'CHEF-900' of git://github.com/tfheen/chef into tfheen/CHEF-900Adam Jacob2010-01-271-8/+21
|\ \ \ \
| * | | | Only admins can change the "is admin" bit.Tollef Fog Heen2010-01-271-8/+21
| |/ / /
* | | | Merge branch 'CHEF-896' of git://github.com/mdkent/chef into mdkent/CHEF-896Adam Jacob2010-01-271-1/+1
|\ \ \ \
| * | | | CHEF-896: Add file_backup_path prefix to log output.Matthew Kent2010-01-251-1/+1
* | | | | Merge branch 'CHEF-860' of git://github.com/nuoyan/chef into nuoyan/CHEF-860Adam Jacob2010-01-2711-86/+203
|\ \ \ \ \
| * | | | | moving the code block to check existing admin user to self.loadedNuo Yan2010-01-251-12/+8
| * | | | | fixing typo in commentNuo Yan2010-01-251-1/+1
| * | | | | Fixing CHEF-860, adding password masking, error handling, and fixed private k...Nuo Yan2010-01-2511-77/+198
| | |_|_|/ | |/| | |
* | | | | Merge branch 'CHEF-864' of git://github.com/danielsdeleo/chef into danielsdel...Adam Jacob2010-01-272-27/+264
|\ \ \ \ \
| * | | | | CHEF-864 WebUIUser must support the std "couchable" APIDan DeLeo2010-01-162-27/+264
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' of git://github.com/commondream/chef into commondream/C...Adam Jacob2010-01-271-3/+5
|\ \ \ \ \
| * | | | | More replacing of the pattern.Alan Johnson2010-01-151-1/+1
| * | | | | Factored out the cron pattern so the code's a bit more maintainable.Alan Johnson2010-01-151-2/+4
| * | | | | Added operator support to cron provider (/ , and -).Alan Johnson2010-01-151-1/+1
| |/ / / /
* | | | | Merge branch 'CHEF-805' of git://github.com/peritor/chef into peritor/CHEF-805Adam Jacob2010-01-272-2/+19
|\ \ \ \ \
| * | | | | CHEF-805: Improved the deploy resource's scm_provider attribute to accept sym...Mathias Meyer2010-01-162-2/+19
| | |/ / / | |/| | |
* | | | | Merge branch 'CHEF-870' of git://github.com/tfheen/chef into tfheen/CHEF-870Adam Jacob2010-01-271-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Reopen stdout and stderr, not stdout twiceTollef Fog Heen2010-01-121-1/+1
| | |/ / | |/| |
* | | | Merge branch 'CHEF-440' of git://github.com/tfheen/chef into tfheen/CHEF-440Adam Jacob2010-01-272-22/+9
|\ \ \ \
| * | | | Make setting the run_list override it, not append to itTollef Fog Heen2010-01-082-22/+9
| |/ / /
* | | | Merge branch 'CHEF-866' of git://github.com/tfheen/chef into tfheen/CHEF-866Adam Jacob2010-01-271-0/+2
|\ \ \ \
| * | | | Make @node and node available in attributesTollef Fog Heen2010-01-081-0/+2
| |/ / /
* | | | Merge branch 'CHEF-438' of git://github.com/tfheen/chef into tfheen/CHEF-438Adam Jacob2010-01-274-17/+52
|\ \ \ \
| * | | | Add support for passing parameters to only_if/not_ifTollef Fog Heen2010-01-084-17/+52
| |/ / /
* | | | Whitespace cleanupAdam Jacob2010-01-261-1/+0
* | | | Adding two seconds to the run interval feature, to avoid false negativesAdam Jacob2010-01-261-1/+1