Commits on Mar 16, 2012
  1. Merge branch 'CHEF-2844'

    btm committed Mar 16, 2012
  2. fix whitespace

    WP committed with btm Jan 4, 2012
  3. add spec test for String#ord monkey-patch

    WP committed with btm Jan 4, 2012
  4. Merge branch 'CHEF-2704'

    btm committed Mar 16, 2012
  5. Merge branch 'CHEF-1202'

    btm committed Mar 16, 2012
  6. [CHEF-1202-regression-0.10.6.beta] Review of Chef 0.10.6.beta for une…

    …scaped regexp matches.
    akzhan committed with btm Nov 23, 2011
  7. CHEF-2689: missing spec test

    lamont-granquist committed with btm Dec 14, 2011
  8. CHEF-2818: Cleanup DeepMerge by

    * Disabling knockout_prefix usage for non role merges as they don't work
      properly (CHEF-2737).
    * Enable knockout_prefix for inherited role merges only. Preserving the
      existing working behaviour for now. This will likely go away in the
    * Duplicate source and dest prior to the merge rather than modifying in
      place which is difficult to debug with nested arrays and mashes. Less
      chance of future bugs.
    * In addition to "!merge:" to knockout an entire array, support the less
      awkward "!merge" variant.
    * Big spec rewrite to test with !merge and account for these changes.
    mdkent committed with btm Dec 15, 2011
  9. CHEF-2716: Don't compare nil versions, use the parent logic. Add missing

    specs for the action_upgrade workaround.
    mdkent committed with btm Nov 8, 2011
  10. CHEF-2443 - gem version numbers are messy

    Now we only provide a version string to our alternative gem binary if
    we're actually provided with one. This allows gem_package#action_upgrade
    to work in the case where no version is specified.
    Thom May committed with btm Dec 7, 2011
  11. Merge branch 'CHEF-1902'

    btm committed Mar 16, 2012
  12. Patch for #CHEF-1902 -- rescue error when erubis error has no line nu…

    If erubis isn't sure what line caused the error, then `line_number` is nil; this makes the rescue block fails with its own error and sadness follows confusion. Made `source_listing` dump all lines in this case -- it's probably an omitted 'end' or other full-template error
    Philip (flip) Kromer committed with btm Nov 20, 2011
  13. Use privileges to set owner; add owner tests

    User was unable to set owner to anything other than themselves.
    This allows users with Administrator privileges (i.e. an Administrator
    command prompt or the Administrator user) to set the owner of a
    file to anything.  It also fixes a bug where we did not properly
    propagate the error when setting security info failed.
    jkeiser committed Jan 30, 2012
  14. Fix Windows permissions to be more like the dialog

    - Make permissions :full_control, :modify, :read, :read_execute, :modify
    - Support integer permissions
    - Add deny_rights
    - Make deny_rights order independent
    - Fix default value for applies_to_children
    jkeiser committed Jan 24, 2012
  15. Fix bug in remote directory where a hash was expected when an array w…

    …as provided; affected windows only
    mmzyk committed with jkeiser Jan 20, 2012