Permalink
Commits on Nov 25, 2014
  1. Merge pull request #2487 from opscode/lcg/fix-windows-warn

    suppress locale -a warnings on windows
    lamont-granquist committed Nov 25, 2014
  2. suppress locale -a warnings on windows

    need the '!' to throw exceptions, or else the rescue clause is
    never run.
    lamont-granquist committed Nov 25, 2014
  3. Merge pull request #2483 from opscode/sersut/contrib-pass

    Merge pass for contributions.
    Serdar Sutay committed Nov 25, 2014
  4. Merge pull request #2423 from jonlives/master

    Adding MAINTAINERS.md file per RFC-030 and proposing myself as maintainer for Core & Enterprise Linux
    adamhjk committed Nov 25, 2014
  5. Contribution information for chef#2439.

    Serdar Sutay committed Nov 25, 2014
  6. Contribution information for chef#2452.

    Serdar Sutay committed Nov 25, 2014
  7. Merge branch 'empty_version' of github.com:lucywyman/chef

    Serdar Sutay committed Nov 25, 2014
Commits on Nov 24, 2014
  1. Merge pull request #2445 from juliandunn/remove-travis-187-workaround

    Revert rubygems 2.2.0 with bundler 1.5 with Ruby 1.8.7 fix
    juliandunn committed Nov 24, 2014
  2. Merge pull request #2462 from opscode/lcg/remove-knockout-merge

    remove old knockout merge exception
    Serdar Sutay committed Nov 24, 2014
Commits on Nov 22, 2014
Commits on Nov 21, 2014
  1. provider resolver perf improvement

    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.
    lamont-granquist committed Nov 21, 2014
  2. remove old knockout merge exception

    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.
    lamont-granquist committed Nov 21, 2014
  3. add more commentary

    lamont-granquist committed Nov 20, 2014
  4. Merge pull request #2464 from opscode/lcg/to-hash-specs

    adding some more specs around to_hash
    lamont-granquist committed Nov 21, 2014
Commits on Nov 20, 2014
  1. Merge pull request #2447 from opscode/lcg/lazy-deep-merge2

    Lcg/lazy deep merge2
    Serdar Sutay committed Nov 20, 2014
Commits on Nov 19, 2014
  1. revert to serdar's deep_merge de-dup version

    lamont-granquist committed with Serdar Sutay Nov 19, 2014
  2. typo fix in specs

    lamont-granquist committed with Serdar Sutay Nov 19, 2014
  3. add specs busted by dup removal

    lamont-granquist committed with Serdar Sutay Nov 19, 2014
  4. fix reset_cache specs busted by removing that

    lamont-granquist committed with Serdar Sutay Nov 19, 2014
  5. fix ImmutableAttributeModification exception

    lamont-granquist committed with Serdar Sutay Nov 19, 2014
  6. remove cache resetting

    lamont-granquist committed with Serdar Sutay Nov 19, 2014
  7. remove lots of useless deep merge duping

    lamont-granquist committed with Serdar Sutay Nov 19, 2014
  8. WIP: lazy deep merging

    lamont-granquist committed with Serdar Sutay Nov 13, 2014
  9. Merge branch 'tball/restore-050d148' - this merges PR chef#2073 into …

    …master after the force-push shenanigans
    tyler-ball committed Nov 19, 2014
  10. Setting version to an empty string in tests

    Check for nil and length on version in package/rubygems tests
    
    In gemspec test change @new_resource.instance_variable_set()
    to @new_resource.version()
    lucywyman committed Nov 19, 2014
  11. Merge pull request #2073 from opscode/ryan/group_post-master

    Populate the actors when creating groups
    Serdar Sutay committed Nov 19, 2014