summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | #role_merge becomes #merge not #deep_mergeLamont Granquist2014-11-211-3/+2
| | | | | | | |
| * | | | | | | role_merge can be elmianted nowLamont Granquist2014-11-212-11/+2
| | | | | | | |
| * | | | | | | remove InvalidSubtractiveMerge classLamont Granquist2014-11-211-2/+0
| | | | | | | |
| * | | | | | | remove invalid invalidsubtractivemerge specsLamont Granquist2014-11-211-26/+0
| | | | | | | |
| * | | | | | | provider resolver perf improvementLamont Granquist2014-11-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move the sorting of the providers to after we make the first cut, still keeps deterministic ordering, but avoids sorting providers we are just going to throw away.
| * | | | | | | remove old knockout merge exceptionLamont Granquist2014-11-211-33/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | chef 11 has raised an exception on this for nearly 2 years, we now simply no longer care and don't spend the cycles to check.
| * | | | | | | add more commentaryLamont Granquist2014-11-211-4/+20
| | | | | | | |
| * | | | | | | add partial deep merge cacheLamont Granquist2014-11-213-12/+65
|/ / / / / / /
* | | | | | | Merge pull request #2464 from opscode/lcg/to-hash-specsLamont Granquist2014-11-211-0/+28
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | adding some more specs around to_hash
| * | | | | | adding some more specs around to_hashlcg/to-hash-specsLamont Granquist2014-11-201-0/+28
|/ / / / / /
* | | | | | Merge pull request #2447 from opscode/lcg/lazy-deep-merge2Serdar Sutay2014-11-195-105/+131
|\ \ \ \ \ \ | | | | | | | | | | | | | | Lcg/lazy deep merge2
| * | | | | | revert to serdar's deep_merge de-dup versionLamont Granquist2014-11-191-4/+16
| | | | | | |
| * | | | | | typo fix in specsLamont Granquist2014-11-191-1/+1
| | | | | | |
| * | | | | | add specs busted by dup removalLamont Granquist2014-11-191-0/+34
| | | | | | |
| * | | | | | fix reset_cache specs busted by removing thatLamont Granquist2014-11-191-44/+0
| | | | | | |
| * | | | | | fix ImmutableAttributeModification exceptionLamont Granquist2014-11-193-8/+9
| | | | | | |
| * | | | | | remove cache resettingLamont Granquist2014-11-192-9/+0
| | | | | | |
| * | | | | | remove lots of useless deep merge dupingLamont Granquist2014-11-191-2/+2
| | | | | | |
| * | | | | | WIP: lazy deep mergingLamont Granquist2014-11-191-46/+78
|/ / / / / /
* | | | | | Merge branch 'tball/restore-050d148' - this merges PR ↵tyler-ball2014-11-192-0/+67
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | https://github.com/opscode/chef/pull/2073 into master after the force-push shenanigans
| * | | | | Merge pull request #2073 from opscode/ryan/group_post-mastertball/restore-050d148Serdar Sutay2014-11-192-0/+67
| |\ \ \ \ \ | | | | | | | | | | | | | | Populate the actors when creating groups
| | * | | | | Add unit test for group normalization in ChefFSRyan Cragun2014-11-191-0/+63
| | | | | | |
| | * | | | | Populate the actors when creating groupsRyan Cragun2014-11-191-0/+4
| | | | | | |
* | | | | | | Merge pull request #2425 from opscode/lcg/memoize-localemh/recoverLamont Granquist2014-11-182-36/+36
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | stop recomputing locale -a constantly
| * | | | | | | stop recomputing locale -a constantlylcg/memoize-localeLamont Granquist2014-11-172-36/+36
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes an outstanding issue on the locale -a guessing also fixes perf issues in the rspec tests (e.g. deploy provider)
* | | | | | | Fix typo in release notes.Julian C. Dunn2014-11-181-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #2424 from opscode/sersut/chef-2356Serdar Sutay2014-11-174-11/+69
|\ \ \ \ \ \ | | | | | | | | | | | | | | :auto mode for :file_staging_uses_destdir
| * | | | | | Dedicated error for content staging issues. Comment fixes in config.rb.Serdar Sutay2014-11-173-4/+11
| | | | | | |
| * | | | | | Fixes based on PR comments.sersut/chef-2356Serdar Sutay2014-11-141-8/+9
| | | | | | |
| * | | | | | Introduct :auto mode for :file_staging_uses_destdir which tries the dest_dir ↵Serdar Sutay2014-11-143-11/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | first and falls back to tmpdir when unsuccessful.
* | | | | | | Merge pull request #2427 from opscode/jdmundrawala/path-sep-refactorJay Mundrawala2014-11-171-10/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Use platform_specific_path in chef shell
| * | | | | | Use platform_specific_path in chef shelljdmundrawala/path-sep-refactorJay Mundrawala2014-11-141-10/+2
| | | | | | |
* | | | | | | Merge pull request #2421 from opscode/lcg/faster-rspecLamont Granquist2014-11-142-19/+25
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | skip expensive spec tests by default
| * | | | | | skip expensive spec tests by defaultLamont Granquist2014-11-142-19/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `rake spec` skips knife integration tests - `rake spec:all` includes them - PRs only get `rake spec` - master (and 10/11/12-stable) get `rake spec:all` - rspec and rspec spec are still essentially rake spec:all (so omnibus-chef still tests every spec) - also some cleanup of the rspec jobs
* | | | | | | Add another case for chef-dk#227 to ensure regex correctnesschef-dk-227-masterdanielsdeleo2014-11-131-0/+9
| | | | | | |
* | | | | | | Fix conflicting data in test casesdanielsdeleo2014-11-131-4/+4
| | | | | | |
* | | | | | | Merge branch 'chef-dk-227' into 11-stabledanielsdeleo2014-11-132-1/+90
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #2420 from opscode/lcg/openbsd-packageLamont Granquist2014-11-139-2/+289
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Lcg/openbsd package
| * | | | | add md files for openbsd package providerLamont Granquist2014-11-132-1/+12
| | | | | |
| * | | | | rspec 3 fixes for openbsd package resourceLamont Granquist2014-11-131-3/+3
| | | | | |
| * | | | | add comment about stems with flavorsScott Bonds2014-11-131-1/+1
| | | | | |
| * | | | | use PKG_PATH instead of PACKAGEROOT/SITEScott Bonds2014-11-132-12/+6
| | | | | |
| * | | | | add support for double-dash in package nameScott Bonds2014-11-131-4/+21
| | | | | |
| * | | | | remove sqlite3 dependencyScott Bonds2014-11-131-1/+0
| | | | | |
| * | | | | misc cleanupScott Bonds2014-11-132-6/+6
| | | | | |
| * | | | | fix candidate_version return valueScott Bonds2014-11-131-4/+7
| | | | | |
| * | | | | simplify openbsd package providerScott Bonds2014-11-132-449/+23
| | | | | |
| * | | | | add openbsd package providerScott Bonds2014-11-138-1/+690
|/ / / / /
* | | | | Merge pull request #2418 from opscode/lcg/goalie-mergingLamont Granquist2014-11-139-54/+21
|\ \ \ \ \ | | | | | | | | | | | | Lcg/goalie merging
| * | | | | md files for mergesLamont Granquist2014-11-131-0/+7
| | | | | |