the function, not the module
more urlparse
Merge branch 'py3' of github.com:thatch45/salt into py3
revert ipy3 pydsl, the exec call is broken
maketrans is tricky, this will take more thought
fix pyobjects exec calls
pylint fixes
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge pull request #17281 from s0undt3ch/develop

Merge branch '2014.7' forward into develop
Merge pull request #17287 from jfindlay/jmoney/cp_test

unit tests for the cp execution module
Merge branch '2014.7' into develop
Merge pull request #17269 from thatch45/py3

Make Salt INSTALL on Python3 (NOT RUN - that will be another PR)
Added support for caller kind opts['__role'] for raet salt caller
Added support for RAETCaller to standup minion in process
Remove unapplicable behaviors from caller.flo
Use kinds so future proofed
refactor to use class specific loadLocalRoleData
Add reject reason log messages
Initial HP ilom integration
Correcting terminology