summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [OC-3564] move core Chef to the repo root \o/ \m/Seth Chisamore2012-10-30991-442/+47
* Merge branch 'OC-3564-remove-chef-server'Seth Chisamore2012-10-30555-24896/+60
|\
| * [OC-3564] remove CouchDB related code \m/Seth Chisamore2012-10-3022-1703/+28
| * [OC-3564] remove Chef::CheckSum and Chef::SandboxSeth Chisamore2012-10-305-415/+0
| * [OC-3564] remove Chef::WebUIUserSeth Chisamore2012-10-302-156/+0
| * [OC-3564] remove Chef::OpenIDRegistrationSeth Chisamore2012-10-303-341/+2
| * [OC-3564] remove server-side cookbook version codeSeth Chisamore2012-10-305-506/+16
| * [OC-3564] remove Chef::CertificateSeth Chisamore2012-10-304-277/+7
| * [OC-3564] remove Chef::IndexQueueSeth Chisamore2012-10-3017-827/+62
| * [OC-3564] remove Chef::SolrQuerySeth Chisamore2012-10-3010-1729/+0
| * [OC-3564] update spec to not depend on ActiveSupportSeth Chisamore2012-10-301-2/+4
| * [OC-3564] update README for recent changesSeth Chisamore2012-10-301-73/+3
| * [OC-3564] remove unused scriptsSeth Chisamore2012-10-304-663/+0
| * [OC-3564] remove cucumber featuresSeth Chisamore2012-10-30433-11112/+0
| * [OC-3564] remove `chef-server` meta-gemSeth Chisamore2012-10-306-331/+0
| * [OC-3564] remove `chef-server-api`Seth Chisamore2012-10-3061-6823/+0
|/
* Merge branch 'CHEF-3561'danielsdeleo2012-10-252-1/+37
|\
| * [CHEF-3561] add template context for template errorsdanielsdeleo2012-10-252-1/+37
|/
* Merge branch 'CHEF-2737'danielsdeleo2012-10-192-652/+75
|\
| * [CHEF-2737] add more tests for knockout detectiondanielsdeleo2012-10-192-1/+30
| * [CHEF-2737] remove options from deep mergedanielsdeleo2012-10-192-8/+8
| * [CHEF-2737] remove subtractive mergedanielsdeleo2012-10-192-472/+39
| * [CHEF-2737] remove unused array sorting featuredanielsdeleo2012-10-192-11/+0
| * [CHEF-2737] remove unused array splitting featuredanielsdeleo2012-10-192-152/+39
| * [CHEF-2737] remove preserve_unmergeable optiondanielsdeleo2012-10-192-68/+19
|/
* Merge branch 'CHEF-2992'danielsdeleo2012-10-1928-641/+769
|\
| * [CHEF-2992] add a test that auto-loaded attr files get marked as seendanielsdeleo2012-10-191-0/+8
| * [CHEF-2992] add more test coverage around attributes loadingdanielsdeleo2012-10-192-0/+9
| * [CHEF-2992] remove proxy object for evaluating attributesdanielsdeleo2012-10-197-141/+50
| * [CHEF-2992] remove vestigial Node#find_filedanielsdeleo2012-10-193-53/+4
| * [CHEF-2992] rm unimplemented RunContext#loaded_attribute?danielsdeleo2012-10-191-4/+0
| * [CHEF-2992] also remove vestigial template_cachedanielsdeleo2012-10-192-5/+4
| * [CHEF-2992] remove remaining attribute loading code from Nodedanielsdeleo2012-10-191-13/+1
| * [CHEF-2992] Eval attr files via proxy objectdanielsdeleo2012-10-199-85/+142
| * [CHEF-3499] move include attribute into DSL namespacedanielsdeleo2012-10-195-41/+71
| * [CHEF-3499] move include recipe to DSL namespacedanielsdeleo2012-10-196-22/+50
| * [CHEF-3499] remove data query and platform introspection from recipe dsldanielsdeleo2012-10-194-5/+19
| * [CHEF-3499] move data query DSL to its own filedanielsdeleo2012-10-198-45/+81
| * [CHEF-3499] extract platform introspection to its own DSL moduledanielsdeleo2012-10-197-426/+491
| * [CHEF-3499] Create DSL namespace, move recipe DSL there.danielsdeleo2012-10-196-68/+98
| * [CHEF-2992] remove `seen_recipes` from nodedanielsdeleo2012-10-195-40/+48
|/
* Further simplify diff data hack to catch more formatsBryan McLellan2012-10-161-7/+10
* Move regex into a constant in chef_fs diff specBryan McLellan2012-10-161-8/+10
* Handle GMT and postive time zones in spec testBryan McLellan2012-10-161-1/+3
* CHEF-1804: Update knife ssh specBryan McLellan2012-10-161-2/+2
* Merge branch '10-stable'Bryan McLellan2012-10-16116-323/+1757
|\
| * RC release: 10.16.0.rc.010.16.0.rc.0Bryan McLellan2012-10-116-6/+6
| * CHEF-3484: skip item if lacking the specified attributeBryan McLellan2012-10-111-2/+3
| * CHEF-3484: Modified configure_session method to skip nil items in loopMilos Gajdos2012-10-111-1/+4
| * [CHEF-3413] Protect secret files created by bootstrap templatesTeemu Matilainen2012-10-117-1/+14