rallytime 1fe0b69a6c Merge branch '2016.3' into 'develop' ... Conflicts: - salt/modules/blockdev.py - salt/modules/ddns.py - salt/modules/inspectlib/collector.py - salt/modules/linux_sysctl.py - salt/modules/status.py - salt/modules/x509.py - salt/utils/process.py - salt/utils/verify.py - tests/integration/__init__.py - tests/integration/modules/state.py - tests/integration/states/cmd.py		2016-08-12 16:21:58 -06:00
..
handlers	Rempve iteritems() reference from log4mongo_mod handler	2016-07-18 16:22:37 -06:00
__init__.py	Making salt.log.__init__ python3 compatible	2014-11-11 16:41:13 -05:00
mixins.py	Merge branch '2015.8' into '2016.3'	2016-03-18 11:26:12 -06:00
setup.py	Merge branch '2016.3' into 'develop'	2016-08-12 16:21:58 -06:00