89559 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ch3LL	b4b59b89cd	remove platform from salt.utils call for 2017.7	2018-01-04 14:42:30 -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	543eebf411	Merge pull request #45259 from Ch3LL/fix-mac-service-test ... Fix MacOSX Service Status Check and integration test	2018-01-04 09:25:01 -05: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	bbbd1872a7	Merge pull request #45263 from sumeetisp/2017.7 ... Updating python version for 2017.7	2018-01-04 09:16:26 -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
Nicole Thomas	d46e1197be	Merge pull request #45244 from twangboy/win_fix_portable.py ... Fix search/replace in Py3	2018-01-04 09:02:21 -05:00
Nicole Thomas	b31e08946a	Merge branch '2017.7' into win_fix_dacl	2018-01-04 08:57:32 -05:00
Neeraj	b3660d5190	[#23454] make pydsl work with salt-ssh	2018-01-04 18:54:57 +05:30
sumeetisp	e3a5ee3a08	Merge branch '2017.7' into 2017.7	2018-01-04 11:00:42 +05:30
sumeetisp	71aea9a3bc	Merge pull request #1 from sumeetisp/sumeetisp-python-version ... Updating python version	2018-01-04 10:57:48 +05:30
sumeetisp	1b4806e2b9	Updating python version ... As 2017.7 does not support python 2.6 documentation needs to be updated to reflect this dependency	2018-01-04 10:56:56 +05:30
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
Ch3LL	74e6ed60ea	Fix MacOSX Service Status Check and integration test	2018-01-03 17:19:51 -05: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
Volodymyr Samodid	6ceafbbf3a	use KillMode=process for salt-minion.service	2018-01-03 14:38:23 -05:00
Ch3LL	85e853a63d	Add darwin value for ssh grain items tests on MacOSX	2018-01-03 13:58:28 -05:00
twangboy	e3a8279c01	Get path to python binary based on executable	2018-01-03 10:19:09 -07:00
Nicole Thomas	eba360870a	Merge pull request #45233 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2016.11 to 2017.7	2018-01-03 10:33:59 -05: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
twangboy	03aec37040	Fix search/replace in Py3	2018-01-02 15:22:58 -07:00
rallytime	a3d251b2cd	Merge branch '2016.11' into '2017.7'	2018-01-02 15:21:58 -05:00
Nicole Thomas	b75f50afe3	Merge pull request #45235 from rallytime/bp-45209 ... Back-port #45209 to 2016.11	2018-01-02 15:20:14 -05: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	693cc807e8	Merge pull request #45175 from amendlik/pkg-uptodate ... Pkg uptodate	2018-01-02 12:38:35 -05:00
Daniel Wallace	2d0a9bbf7e	enable UsePAM for ssh tests	2018-01-02 12:29:43 -05:00
rallytime	5d9a1e91e9	Merge branch '2016.11' into '2017.7' ... No conflicts.	2018-01-02 12:23:50 -05:00
Nicole Thomas	3ab962b01a	Merge pull request #44965 from gtmanfred/2016.11 ... check if VALUE is a string_type	2018-01-02 11:42:38 -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	40fb30f63f	Merge pull request #45232 from rasathus/2016.11 ... Backport #27160 to 2016.11	2018-01-02 10:48:22 -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
Nicole Thomas	4f514a29a7	Merge branch '2017.7' into pkg-uptodate	2018-01-02 09:56:28 -05:00
Rasathus	7a2bd8f49b	Merge branch '2016.11' into 2016.11	2018-01-02 12:38:13 +00:00
Gareth J. Greenaway	ba7ff8b2e0	Merge branch 'oxygen' into scheduler_cron_tests	2018-01-01 16:46:02 -08:00
Daniel Wallace	1b3f3ba1be	Merge pull request #45226 from gtmanfred/2017.7 ... Update kitchen to use runtests verifier on 2017.7	2017-12-31 11:13:27 -07: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
Daniel Wallace	4f3b089e0e	fix copying back	2017-12-31 11:10:28 -07:00
Daniel Wallace	f56f062a6a	download xml for junit	2017-12-31 11:10:16 -07:00
Daniel Wallace	7cc342a5d6	use new runtests verifier	2017-12-31 11:10:01 -07:00
Nicole Thomas	b3e0146ca1	Lint: 2 spaces before comment	2017-12-30 16:10:37 -05:00