test commmit
undo test commit
Adds virtualization detection to Windows
states.module.run: fix passing kwargs issue#6493

states module.run couldn't pass kwargs correctly.
This fix the issue, and allow to pass a dict directly from a state file.
Fix jinja = vs == in states.file documentation
Merge pull request #6498 from vimalloc/patch-1

Fix jinja = vs == in states.file documentation
Add links to windows Salt 0.16.2 installers
bump Salt windows installer version to 0.16.2
Merge pull request #6499 from UtahDave/win_installer_docs

Add links to 0.16.2 Salt Windows installers.  Bump Windows installer version
Properly detect Linaro (Ubuntu derivative)

This commit sets the os_family grain to 'Debian', thus enabling apt to
be detected as the pkg provider. In addition, it properly sets the
service provider to upstart.
Add note about new mount.unmounted state

This state will not be available until 0.17.0, adding this note so the
docs reflect that.
Merge pull request #6501 from terminalmage/docs

Add note about new mount.unmounted state
Merge pull request #6500 from terminalmage/issue6496

Properly detect Linaro (Ubuntu derivative)
pkg_resource mod: rm unused import

************* Module salt.modules.pkg_resource
W0611:  6,0: Unused import collections
Merge pull request #6504 from cvrebert/patch-1

pkg_resource mod: rm unused import
ddns: fix bugs in add_host and delete_host
Merge branch 'develop' into ddns
Fix traceback in salt-call --local

This fixes #6502 by reverting 83c2e61 and removing the lines in
salt.minion.get_proc_dir that clear out the proc dir, since this is not
the desired behavior.
ddns: don't clobber PTR records with a different hostname
Merge pull request #6506 from terminalmage/issue6502

Fix traceback in salt-call --local