test commmit
undo test commit
Adds virtualization detection to Windows
apache server-status function
import urllib2 in apache module
Fix 32-bit binary package installs on 64-bit OS

This fixes #6303. It also forces a change in SLS for apt-based systems,
to avoid a name collision with the 64-bit version of the package. 32-bit
binary packages must now be referred to using pkgname:arch, as they
appear in dpkg --list.
Docstring tweak for pull req #6461
Merge pull request #6461 from terminalmage/issue6303

Fix 32-bit binary package installs on 64-bit OS
Fix extfs module kwarg_map

This fixes #6462. the "kwarg_map" was not taking into account the
"private" kwargs that get passed.
Merge pull request #6463 from terminalmage/issue6462

Fix extfs module kwarg_map
Added unit test for list nested `OrderedDict`'s. Refs #6460.
Simplify `OrderedDict` -> `dict` conversion.
Docmentation tweaks in advance of 0.16.2 release
Merge pull request #6466 from terminalmage/docs

Docmentation tweaks in advance of 0.16.2 release
Merge pull request #6465 from s0undt3ch/features/payload-testing

Added unit test for list nested `OrderedDict`'s. Refs #6460.
Add release notes for 0.16.2
Used a safer method to get proc_fn

Previously, this called get_proc_dir(), which clears the contents of the
specified directory, resulting in issue #6238.
Added a few more changes to 0.16.2 release notes
Merge pull request #6469 from terminalmage/release_notes

Add release notes for 0.16.2
Merge pull request #6468 from intchanter/develop

Used a safer method to get proc_fn