DSCL resource says it doesn't support OS X below 10.7, so don't run it on 10.6.
Add the pending() guard to the 'when there's no reboot keys present' spec.
Merge pull request #2024 from opscode/jdmundrawala/windows_env_path

Windows path fix
Conflicts:
	spec/functional/resource/env_spec.rb
Updated CHANGELOG for env resource change
Merge pull request #1912 from jessehu/CHEF-ISSUE-1904

retry on HTTP 50X Error when calling Chef REST API
Merge pull request #2151 from opscode/sersut/backport-chef-1912

Merge pull request #1912 from jessehu/CHEF-ISSUE-1904
Merge pull request #2142 from opscode/jdmundrawala/11-windows-env-fix

Jdmundrawala/11 windows env fix
Make FileVendor configuration specific to the two implementations

FileVendor previously was configured by storing a closure/anonymous
function as a class instance variable. This had the following downsides:
* The API was too general, which caused a lot of code repetition
* The block was lazily evaluated, which hid errors and made testing more
  difficult
* The closures captured references to classes with references to large
  data structures, which complicates GC.

Since we've only ever had the same two implementations of FileVendor, we
can encapsulate configuration of the FileVendor factory by wrapping each
configuration option in a method. As a side benefit, arguments to these
methods will be eagerly evaluated, which makes it easier to detect
errors.
Merge pull request #2179 from opscode/sersut/port-policyfile-fix

Make FileVendor configuration specific to the two implementations
CHANGELOG and version updates for 11.16.4.
Merge pull request #2182 from opscode/sersut/rel-11.16.4

CHANGELOG and version updates for 11.16.4.
First pass at removing JSON dependency, switching it for ffi-yajl
Fixing integration tests I didn't check last time I committed
Ruby 1.8.7 does some weird hash printing where it gives different ordering - simplifying test to avoid that
Moving documentation to CHANGELOG since no online documentation needs to update with this
Removing old .to_json monkeypatching for all objects
Using my ffi-yajl branch where I fixed Objects that do not support to_json