added get_resource_path and get_resource_string
renamed get_resource_string to get_resource_content
made copying the environment safe
lvresize initial commit
use izip instead of izip_longest
removed unnecessary import
fixed test_os_environment_remains_intact
lvresize added
Fixed 'virtual: VirtualPC' setting on FreeBSD in salt/grains/core.py
Merge branch 'lvresize_test' of https://github.com/ror6ax/salt into ror6ax-lvresize_test
mor safely handle args and fix lint
Switch mdadm.create to not shell out
Merge pull request #15104 from srkunze/feature/safe_env

Made safe environment copy
Need to properly add lists to each other
Let's do assemble while we're at it
Add debug log entry on master key rotation
Merge pull request #15603 from jacksontj/aes_rotation

Add debug log entry on master key rotation
Merge pull request #15599 from thatch45/ror6ax-lvresize_test

merge #15566
Merge pull request #15600 from techhat/mdadm

Switch mdadm.create to not shell out
Merge pull request #14984 from srkunze/feature/virtualenv_mod

feature/virtualenv_mod