Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Make states created outside of an extend usable inside it.
Merge pull request #3309 from herlo/develop

New 0.12.0 spec file
Default refresh to True (ebuild)

See #3302
Make both "refresh=true" and "refresh=True" work

Also pep8 fixes.
Default refresh to True (pkgutil) + pep8 fixes

See #3302
Add refresh param + pep8 fixes

list_upgrades and upgrade are not yet implemented, but I added some
commented-out bits that can be uncommented once these functions are
implemented.
Default refresh to True (yumpkg) + pep8 fixes

See #3302
Added unittest support to rpm spec.
Default refresh to True (yumpkg5) + pep8 fixes

See #3302
Default refresh to True (zypper) + pep8 fixes

See #3302
Prevent traceback using refresh param

This commit forces the 'refresh' param to be cast as a string to keep
things like 'refresh: 123' in a pkg state from causing a TypeError.
Prevent traceback using refresh param

Make the same change as was made in f0d1043 to pacman.py
Fix typo introduced in f0d1043
Add other sources of examples

I have a lengthy and growing "public" states repository that I build my various clients production on top of it.

some of them can be a little exotic.

and I think that I have the only public example of file.accumulated
SLES grain fix (#3275)

The 'os' grain in SLES 11 SP2 is 'SUSE  Enterprise Server' (two spaces).
Tried to fix this a couple days ago but didn't notice the extra space
after 'SUSE'. See the following:

https://github.com/saltstack/salt/issues/3275#issuecomment-12425372
Merge pull request #3318 from archtaku/develop

SLES grain fix (#3275)
Fix Ubuntu bug in pkg.purged, pkg.removed states

17e35529 introduced a bug in which a nonexistant kwargs dict was being
referenced in the pkg.purge and pkg.remove functions. This is a blocker
for pkg.purged and pkg.removed states in Ubuntu.

I added kwargs to the pkg.purged and pkg.removed states, as well as to
each pkg provider which had a purge or remove function.

Note that this commit contains a lot of the same pep8 fixes that I made
in pull request #3311, so let me know if you want me to rebase once this
is merged.
Merge pull request #3310 from essentialed/develop

Added unittest support to rpm spec.