Fixes issue(s) in saltstack/salt repo issue #11096
Fixes issue(s) in saltstack/salt repo issue #11096
reverted bad/unnecessary fix
Merge branch 'develop' of github.com:sandbender/salt into develop
re-removed :/
Add 2014.1.3 release notes
Update doc version to 2014.1.3
Fix test=True output for supervisord.running state

This commit properly identifies when no action needs to be taken and
returns True in those cases.
Pulled Jinja docs back into the code

We were accumulating two versions of the docs since people update
docstrings as they hack but only one was getting rendered on the site.

Hopefully this is a happy middle-ground by spreading the docs around a
bit and pulling them in to a central location.
Add sqs receive and delete functions
pylint wanted whitespace after the trailing comma
are in the enum of the users. this was used also to know when to
kick out of the while loop. This is one of those moments where you
wish that python had a "do while" feature. So i peiced something
together that allows res to start at 0 instead of 1. This solved the
problem of the first user being dropped from the list of users.
Initial commit of boto_sqs state and module

This state and module manage SQS queues via boto, rather than the
aws commands. Since it's using boto, it supports IAM instance profile
credentials natively. The module and state also support the ability
to accept key/keyid credentials as parameters, through pillars or
through minion configuration.

In addition, the state and module supports managing queue attributes.
In the state this is added as an argument. In the module it's a separate
function. The module also has support for fetching the attributes for a
queue.
Use salt's master `clean_proc` routine.

On Fedora 20, we hit an issue, at least, similar to #3618.
While debugging it, I've found that the runtests process keeps eating
memory.

Using `clean_proc` has at least, allowed the runtests to finish without
triggering #3618.
Merge pull request #12106 from s0undt3ch/develop

Use salt's master `clean_proc` routine.
cron: fix #11935
cron: pylint fixes
cron: fix test
make dirs if not exist in test
Merge remote-tracking branch 'upstream/develop' into sam_raet_38