Merge pull request #1597 from criteo/modify_env

Don't modify variable passed to env resource when updating
Merge pull request #1616 from chr4/userdel-force

Add "force" attribute to resource/user, passing "-f" to userdel
Merge pull request #1638 from bcobb/version-constraint-string-reflects-behavior

Chef::VersionConstraint#to_s should accurately reflect the constraint's behavior
Merge pull request #1658 from kgraham/master

Bad handling of ShellOut:live_stream
Merge pull request #1667 from parabuzzle/fix_force_flag

[CHEF-1652] Fix force flag
Merge pull request #1669 from Kasen/pcs_support

Parallels cloud server platform support.
Merge pull request #1680 from BundesIT/master

Some minor fixes for the Paludis package provider
Merge pull request #1676 from higanworks/use_shared_path_for_deploy_resource

shared_path can be used to get the path to the shared_path in deploy resource
Update for merges
Merge pull request #1681 from victorhahncastell/master

Apply template syntax check to files in the templates dir only. This avo...
Merge pull request #1694 from jordane/jordane/git_branch_B

git provider fails on existing branch names
Merge pull request #1719 from evertrue/evertrue/eherot/add_mount_point_word_boundaries

Added whitespace boundaries to some of the mount point references in mount resource
Merge pull request #1743 from juliandunn/suse-package-removal-failure

fix SuSE package removal failure
Update for merges
AIX functional tests involving BFF need to be run as root.
add json pretty print tests to some knife show commands
remove #to_json Monkeypatching
Revert "remove #to_json Monkeytpatching"

This reverts commit adbb0fa85cc45b93ba91dc3019094b312cafb35c.
log resource should support whyrun

also, modernization of specs for log provider
Merge pull request #1725 from opscode/lcg/log-whyrun

log resource should support why-run