summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* properly use ui.warnlcg/add-warnLamont Granquist2014-11-231-1/+1
* add warningLamont Granquist2014-11-231-0/+1
* Merge pull request #2464 from opscode/lcg/to-hash-specsLamont Granquist2014-11-211-0/+28
|\
| * 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
|\
| * 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 https://github.com/opsc...tyler-ball2014-11-192-0/+67
|\
| * Merge pull request #2073 from opscode/ryan/group_post-mastertball/restore-050d148Serdar Sutay2014-11-192-0/+67
| |\
| | * 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 constantlylcg/memoize-localeLamont Granquist2014-11-172-36/+36
| |/ /
* | | 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
|\ \ \
| * | | 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
* | | | Merge pull request #2427 from opscode/jdmundrawala/path-sep-refactorJay Mundrawala2014-11-171-10/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | 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 defaultLamont Granquist2014-11-142-19/+25
* | | | 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
|\ \ \ \ | |/ / / |/| | |
| * | | 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
|\ \ \
| * | | md files for mergesLamont Granquist2014-11-131-0/+7
| * | | removed securerandom patchAnshul Sharma2014-11-133-46/+2
| * | | Fix rubygems provider to use https instead of http.Nathan Cerny2014-11-133-8/+8
| * | | cleanup cookbook path from stale filesVasiliy Tolstov2014-11-132-0/+4
|/ / /
* | | Merge pull request #2331 from justanshulsharma/patch-2Lamont Granquist2014-11-131-1/+1
|\ \ \
| * | | File.exists? is deprecated in favor of File.exist?Anshul Sharma2014-10-311-1/+1
* | | | Merge pull request #2407 from opscode/sersut/ci-fix-sparcSerdar Sutay2014-11-121-1/+7
|\ \ \ \ | |_|/ / |/| | |