update basestring -> string_types
update basestring -> string_types
update basestring -> string_types
update basestring -> string_types
update basestring -> string_types
update basestring -> string_types
update basestring -> string_types
update basestring -> string_types
update basestring -> string_types
update basestring -> string_types
update basestring -> string_types
No more proxied immutables. Add test for nested immutables.
Do not rely solely on cached filelisting for sls
Merge pull request #11398 from terminalmage/replace-basestring

Replace instances of "basestring" with salt._compat.string_types
Lint fixes
Merge pull request #11393 from CaptTofu/hpcloud

Added code to better handle floating IPs, pep8/pyflakes cleanup
Merge branch 'cli-arg-parse-refactor' of git://github.com/terminalmage/salt into terminalmage-cli-arg-parse-refactor

Conflicts:
	salt/client/ssh/__init__.py
Merge pull request #11369 from makinacorpus/hfix3

Improvment to salt.utils.cmd:
remove obsolete document
pythonic