test commmit
undo test commit
Adds virtualization detection to Windows
Initial changes to mysql module to allow us to get useful output from SHOW and DESC queries to the server
add prefix support for file_list and dir_list
allow filter to be passed in for list_master and list_master_dirs
file.recurse passes srcpath to fileclient and fileserver/roots.py to only walk that tree, but return results relative to root
add support for unless/onlyif to git.latest
Merge pull request #6455 from jacksontj/develop

Fixing a typo ;)
Issue #6427 fix : Added conditional block to grains/core.py to address CentOS boxes that may have custom content within /etc/centos-release
Merge pull request #6452 from tsheibar/issue-6427

Issue #6427 fix : Choose Package Provider on CentOS Boxes with Custom /etc/centos-release Content
Merge pull request #6454 from mafrosis/git_unless_onlyif

Add support for unless/onlyif to git.latest
Use raw strings for proper backslashes.
Merge pull request #6457 from s0undt3ch/hotfix/pylint-anomalous-backslash

Use raw strings for proper backslashes.
apache server-status function
import urllib2 in apache module
Comment out unused import of sys
Convert OrderedDicts inside of lists
Merge pull request #6460 from basepi/ordereddict

Convert OrderedDicts inside of lists
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