`salt.modules.zpool` is now using `salt.utils.decorators.memoize`
Hide _namespaced_function from salt's loader.

This is needed because in CentOS 5, under python 2.6 that function is flagged as not having a CLI example from the test suite.
Show what the salt function returned in case of assertion errors.
Remove trailing white-space.
preliminary change to allow namespaced events.
Merge pull request #6688 from s0undt3ch/develop

Remove trailing white-space.
Merge pull request #6686 from s0undt3ch/hotfix/hide-namespaced_function

Hide _namespaced_function from salt's loader.
Merge pull request #6687 from s0undt3ch/hotfix/show-additional-info

Show what the salt function returned in case of assertion errors.
Merge pull request #6685 from s0undt3ch/hotfix/memoize-decorator

move and fix memoize decorator
Fixed `integration.states.pip.PipStateTest.test_pip_installed_errors` error regex.

It was failing to match on FreeBSD.
Some more information about the bootstrap process.
Run salt and salt-cloud with debug logging.
The jenkins version of salt does not support log level on the salt binary.
Add timestamp field to postgresql returner
Merge pull request #6696 from basepi/postgresreturner

Add timestamp field to postgresql returner
Changed get_next_event to get_event
added fire_event for testing
Added support for event tags longer than 20 characters.
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	salt/client/api.py
Merge pull request #6700 from SmithSamuelM/develop

Long tags
Merge pull request #6610 from erchn/develop

improve file.recurse performance v2