89419 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ch3LL	0919d8787b	Skip iscsi grains test if MacOSX	2018-01-08 10:54:45 -05:00
Nicole Thomas	538d459b88	Merge pull request #45284 from twangboy/win_fix_build_env ... Put pywin32 dlls in correct location in buildenv scripts	2018-01-05 16:54:21 -05:00
Nicole Thomas	239ab765d9	Merge pull request #45271 from terminalmage/py3-cloud ... [PY3] Add unicode_literals to salt-cloud modules	2018-01-05 12:38:01 -05:00
twangboy	187a420327	Copy not move dlls for PY2	2018-01-04 17:15:00 -07:00
twangboy	8c732b5294	Put dlls in both places for Py2 and Py3	2018-01-04 16:40:43 -07:00
twangboy	2d636266e8	Put dlls in right place for py2 and py3 ... Py2 dlls go in site-packages\win32 Py3 dlls go in site-packages\win32 and the root of python	2018-01-04 15:59:04 -07:00
Nicole Thomas	63172299bf	Merge pull request #45262 from terminalmage/py3-pillar ... [PY3] Add unicode_literals to ext_pillar modules	2018-01-04 17:21:53 -05:00
Erik Johnson	d3f8c13414	[PY3] Add unicode_literals to salt-cloud modules	2018-01-04 13:39:59 -06:00
Erik Johnson	1dc6e79638	[PY3] Add unicode_literals to ext_pillar modules	2018-01-04 08:46:40 -06:00
Nicole Thomas	0343728993	Merge pull request #45258 from twangboy/win_fix_setup ... Win fix setup	2018-01-04 09:18:51 -05:00
Nicole Thomas	0658e0f664	Merge pull request #45190 from terminalmage/yaml ... Replace yaml usage with a helper to ensure unicode is handled properly	2018-01-04 09:04:02 -05:00
Gareth J. Greenaway	8c53b94979	Merge pull request #45260 from gtmanfred/oxygen ... Make some kitchen-salt tests blue	2018-01-03 18:25:22 -08:00
Daniel Wallace	cb8036e680	switch kitchen-salt to use rsync transport to preserve symlinks	2018-01-03 16:07:26 -07:00
Daniel Wallace	19198fd866	fix up symlinks	2018-01-03 15:08:42 -07:00
twangboy	c933f46c6a	Add check for pypiwin32 also	2018-01-03 14:33:06 -07:00
Erik Johnson	1b3b9a9161	Don't raise an exception when we fail to deserialize job cache files ... This prevents a list_jids call from blowing up if something writes bogus data within the job cache. Instead, that bogus file will just be ignored.	2018-01-03 15:31:57 -06:00
twangboy	15317951fc	Update setup.py for new windows install ... setup.py - Remove PyCrypto install, that happens through req.txt - Remove PyYAML install, that happens through req.txt - Add PyWin32 install, that happens with downloaded .whl - Detect if PyWin32 is already installed before installing build_env_#.py - Put PyWin32 dlls in Python root instead of site-packages\win32 - hide gen_py directory creation message	2018-01-03 14:28:36 -07:00
Erik Johnson	002aa88a97	Replace yaml usage with a helper to ensure unicode is handled properly ... Without allow_unicode=True, unicode characters are processed through the str representer and on Python 2 are dumped as a Unicode code point (i.e. a literal \u0414). This commit makes allow_unicode=True the default in our salt.utils.yamlloader.safe_dump() helper. It also adds a new salt.utils.yamlloader.dump() helper which wraps yaml.dump() and also makes allow_unicode=True the default. To make importing and using our custom yaml loader/dumper easier, a convenience module called salt.utils.yaml has been added, which does a wildcard import from both salt.utils.yamldumper and salt.utils.yamlloader. Refs to yaml.load/dump and yaml.safe_load/safe_dump have been updated to salt.utils.yaml, to ensure that unicode is handled properly.	2018-01-03 14:14:21 -06:00
Nicole Thomas	83452f78c8	Merge pull request #45246 from twangboy/win_fix_installer_typos ... Fix a few minor typos in the installer script	2018-01-03 08:48:31 -05:00
Nicole Thomas	253b818e69	Merge pull request #45245 from twangboy/win_fix_cffi_dep ... Roll cffi dep back to version 1.10.0	2018-01-03 08:47:03 -05:00
twangboy	1f2658bbeb	Fix a few minor typos in the installer script	2018-01-02 15:49:35 -07:00
twangboy	12e9d13b21	Roll cffi dep back to version 1.10.0	2018-01-02 15:30:24 -07:00
Nicole Thomas	4ae309af6a	Merge pull request #45222 from rallytime/merge-oxygen ... [oxygen] Merge forward from 2017.7 to oxygen	2018-01-02 14:33:07 -05:00
Nicole Thomas	70ccdef729	Merge pull request #45218 from gtmanfred/oxygen ... fix up rackspace/openstack cloud test	2018-01-02 11:35:04 -05:00
Nicole Thomas	9ee4e242e6	Merge pull request #45128 from garethgreenaway/scheduler_cron_tests ... [oxygen] Adding tests for cron functionality.	2018-01-02 10:47:36 -05:00
Gareth J. Greenaway	ba7ff8b2e0	Merge branch 'oxygen' into scheduler_cron_tests	2018-01-01 16:46:02 -08:00
Daniel Wallace	06c6e92158	Merge pull request #45225 from gtmanfred/kitchen ... fix copying back	2017-12-31 11:11:51 -07:00
Daniel Wallace	90e719a0b8	Merge branch 'oxygen' into kitchen	2017-12-31 11:11:43 -07:00
Nicole Thomas	b3e0146ca1	Lint: 2 spaces before comment	2017-12-30 16:10:37 -05:00
Nicole Thomas	cc13a54e21	Merge pull request #45219 from gtmanfred/test_directory ... test directory that doesn't exist	2017-12-30 13:11:33 -05:00
Daniel Wallace	1182f250ca	fix up rackspace/openstack cloud test	2017-12-30 11:09:45 -07:00
Daniel Wallace	b7932901ca	fix copying back	2017-12-30 11:00:03 -07:00
rallytime	da1e33abea	Merge branch '2017.7' into 'oxygen' ... Conflicts: - pkg/windows/req_base.txt - salt/engines/slack.py - salt/modules/cmdmod.py - salt/modules/osquery.py - salt/modules/pip.py - salt/modules/win_pkg.py - salt/states/pip_state.py - tests/integration/modules/test_cmdmod.py	2017-12-30 08:44:11 -05:00
Nicole Thomas	abed378981	Merge pull request #45204 from garethgreenaway/45176_fixes_to_osquery_module ... [2017.7] Fixes to osquery module & addition of unit tests	2017-12-30 08:25:37 -05:00
Nicole Thomas	296cda8e80	Merge pull request #45207 from terminalmage/py3-spm-queues-rosters ... [PY3] Add unicode_literals to spm, queues, and rosters	2017-12-30 08:24:30 -05:00
Nicole Thomas	51fc937577	Merge pull request #45220 from gtmanfred/kitchen ... use new runtests verifier for kitchen-salt	2017-12-30 07:49:23 -05:00
Nicole Thomas	4637a3b43c	Merge pull request #45211 from terminalmage/py3-transport ... [PY3] Add unicode_literals to transports	2017-12-30 07:40:51 -05:00
Daniel Wallace	8cb15ec689	download xml for junit	2017-12-29 15:00:54 -07:00
Daniel Wallace	d9e868ebd0	use new runtests verifier	2017-12-29 14:23:59 -07:00
Daniel Wallace	fd6597a2b4	test directory that doesn't exist ... sometimes /etc/grub.conf exists and is a symlink to /boot/grub/grub.conf, and this won't do the right thing.	2017-12-29 10:19:24 -07:00
Nicole Thomas	d595c7af36	Merge pull request #45205 from terminalmage/py3-serializers ... [PY3] Add unicode_literals to sdb and serializers	2017-12-28 20:12:31 -05:00
Nicole Thomas	5991d8ca15	Merge pull request #45203 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2016.11 to 2017.7	2017-12-28 20:11:02 -05:00
Nicole Thomas	eefb6d9224	Merge pull request #45209 from gtmanfred/oxygen ... enable UsePAM for ssh tests	2017-12-28 20:08:14 -05:00
Gareth J. Greenaway	dc933e9e24	Fixing typo	2017-12-28 17:07:38 -08:00
Gareth J. Greenaway	d834bd1b6f	Fixing some minor lint issues.	2017-12-28 17:07:38 -08:00
Gareth J. Greenaway	4738205154	Fixing a bug when attributes are passed to various osquery module functions.	2017-12-28 17:07:38 -08:00
Erik Johnson	3f85b60077	[PY3] Add unicode_literals to transports	2017-12-28 17:10:42 -06:00
Nicole Thomas	882267314f	Merge pull request #45201 from rallytime/fix-jinja-template-test-failure ... [2017.7] Check for running on python3 before decoding bytes	2017-12-28 17:59:13 -05:00
Nicole Thomas	2e18398f12	Merge pull request #45200 from rallytime/fix-docstring-test-failure ... [2017.7] Fix docstring integration test failure	2017-12-28 17:58:33 -05:00
Daniel Wallace	0495c0de7f	enable UsePAM for ssh tests	2017-12-28 15:41:25 -07:00