List call not needed. Changing it back to what it was
List call not needed. Changing it back to what it was
List call not needed. Changing it back to what it was
Resolving merge conflict
states.file: salt._compat => six
Making salt.runners.lxc python3 compatible
Merge pull request #17865 from hulu/_compat-int-types

salt._compat.integer_types => six.integer_types
Removing lists and change back to earlier
Merge pull request #17867 from hulu/_compat-types

salt._compat.text_type => six.text_type
Merge pull request #17868 from hulu/_compat-config

modules.config: salt._compat => six
Merge pull request #17869 from hulu/_compat-archive

modules.archive: salt._compat => six
Merge pull request #17870 from hulu/_compat-lxc

modules.lxc: salt._compat => six
Merge pull request #17871 from hulu/_compat-validate-user

salt.utils.validate.user: salt._compat => six
Merge pull request #17872 from hulu/_compat-cron

states.cron: salt._compat => six
Merge pull request #17873 from hulu/_compat-integration-test

tests/integration/__init__.py: salt._compat => six
Merge pull request #17874 from hulu/_compat-libcloudfuncs

cloud.libcloudfuncs: salt._compat => six
Merge pull request #17875 from hulu/_compat-salt-utils

salt/utils/__init__.py: salt._compat => six
Merge pull request #17876 from hulu/_compat-pyobjects

salt/renderers/pyobjects.py: salt._compat => six
Merge pull request #17881 from nmadhok/runners-python3-lxc

Runners python3 lxc
Merge pull request #17877 from hulu/_compat-pydsl

salt/renderers/pydsl.py: salt._compat => six