convert the port to a string
Merge remote-tracking branch 'upstream/develop' into feature_mknod
Updated the documentation for file.py to cover cases with a leading zero for the mode
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'feature_mknod' of github.com:evinrude/salt into feature_mknod
mem_total in BSD should return as an int, see #7104
Fixed wheel function event generation so it fires on tokenized as well as credentialed commands
Fixed formatting of events so that it is consistent with how runner function event data
Changed username field to be user  in event data to match how it is returned in standard minion job returns
Merge remote-tracking branch 'upstream/develop' into develop
Fixed formatting issues/wording in file.py to better match what is present on the troubleshooting page
Move platform-specific pkgdb check to ebuild.py

In preparation for adding similar pre-flight checks to the yumpkg
providers, this commit moves the pre-flight checks done for Gentoo to
ebuild.py.
Use new pkg.checkdb function for pre-flight checks

This establishes a new convention for pkg.installed states: If it is
considered necessary, pre-flight checks can be done to determine if
possible matches can be found for packages with ambiguous names.
Currently this applies to Gentoo-based distros for which package names
are provided without the category, and will (in a later commit) be
expanded to support the yumpkg providers.

In the case of yumpkg{,5}, yum will automagically resolve package names
like "vim" to their actual name, "vim-enhanced", but this breaks
post-install verification of package targets since "vim" !=
"vim-enhanced". The solution, like with Gentoo, will be to attempt to
detect the possible matches for a given package name, and then fail out
of the state. This way, the user will be given a clear indication of the
proper changes to make to their states, and ambiguous package names will
not be tolerated.
handle symlinks to directories in git when force applied
Merge pull request #7113 from mafrosis/git-symlinks

Handle symlinks to directories in git when force applied
Merge pull request #7112 from gravyboat/develop

Updates to file state documentation to resolve issue 6503.
Merge pull request #7095 from riverajo/postgres-port

convert the port to a string
updated to 0.16.4

The spec file is future ready for salt 0.17, this is commented
I have tested it on sles 11 sp3 and opensuse 12.3 vm.
Merge pull request #7116 from aboe76/suse_0.16.4

Suse package updated to 0.16.4
Add kwargs to pre-flight check
yumpkg5: add pkg suggestions for nonexistant packages

See issue #6298 for more information.
yumpkg: add pkg suggestions for nonexistant packages

See issue #6298 for more information.