89735 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	4242e34fd1	Merge pull request #45174 from eradman/freebsd_pkg ... Do not force pkg reinstall on FreeBSD	2018-01-05 08:58:11 -05:00
denza	a5db21eab8	Merge branch 'develop' of github.com:saltstack/salt into profitbricks_cloudapi_v4	2018-01-05 06:13:48 +01:00
twangboy	187a420327	Copy not move dlls for PY2	2018-01-04 17:15:00 -07:00
Adam Bolte	c574bfff95	Add new group param to cmd execution methods ... This has the side effect of having cmdmod support a custom shell on MacOS.	2018-01-05 10:44:33 +11: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
rallytime	153b8d4ebb	Merge branch 'oxygen' into 'develop' ... No conflicts.	2018-01-04 17:46:52 -05:00
rallytime	59076f5ee8	Merge branch '2017.7' into 'oxygen' ... Conflicts: - salt/client/ssh/wrapper/state.py - salt/modules/yumpkg.py	2018-01-04 17:45:29 -05: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
Nicole Thomas	9e222a4cf5	Merge branch 'develop' into freebsd_pkg	2018-01-04 17:21:21 -05:00
Nicole Thomas	401a3e0a76	Merge pull request #45025 from steverweber/fix_pillar_includes ... Fix pillar include merge order	2018-01-04 17:18:38 -05:00
Erik Johnson	7f7fdae9b4	yumpkg: don't use diff_attr when determining install/downgrade targets ... Doing so breaks epoch handling, and is unnecessary anyway since the diff_attr is only used for the return data. Additionally, this tweaks the "attr" argument in both yumpkg and zypper's list_pkgs func so that it will accept a comma-separated list as well as a Python list, and makes a DRY tweak so that we're only returning and formatting the return data in one place in the function.	2018-01-04 16:17:25 -06:00
Nicole Thomas	ff9880c498	Merge pull request #45255 from rallytime/bp-44427 ... Back-port #44427 to 2017.7	2018-01-04 16:46:16 -05:00
Nicole Thomas	e715eb603f	Merge pull request #45251 from forksaber/salt-ssh-pydsl ... Fix #23454 : make pydsl work with salt-ssh	2018-01-04 16:33:09 -05:00
Nicole Thomas	2934b60d53	Merge pull request #45254 from Ch3LL/fix_mac_grain_ssh ... Add darwin value for ssh grain items tests on MacOSX	2018-01-04 16:31:34 -05:00
twangboy	391164e322	Pass if zfs module fails to load	2018-01-04 14:26:12 -07:00
Nicole Thomas	af2d880303	Merge pull request #45135 from twangboy/win_fix_dacl ... Fix win_dacl problems with SIDs	2018-01-04 16:01:47 -05:00
Nicole Thomas	d0a3770035	Merge pull request #44930 from frogunder/man_spm ... man_spm_test	2018-01-04 15:58:01 -05:00
Nicole Thomas	6ff013aca9	Merge pull request #45240 from rallytime/fluorine-release-notes ... Add Fluorine release notes file	2018-01-04 15:57:35 -05:00
denza	bcb2b16317	Merge branch 'develop' of github.com:saltstack/salt into profitbricks_cloudapi_v4	2018-01-04 21:57:30 +01:00
Gareth J. Greenaway	308080bacc	Moving the logic for when a job is diabled futher down into the try_finally block so the _next_fire_time is updated even when a job is disabled. Adding a hidden attribute to keep track of the reason a job was skipped.	2018-01-04 11:55:53 -08:00
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
Gareth J. Greenaway	40e85f3b25	Merge branch 'develop' into 30161_using_unless_onlyif_together	2018-01-04 08:36:56 -08: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	981b2cc0f2	Merge pull request #45149 from golmaal/develop ... #45147 - postgresql returner fails to connect to db when salt-ssh exe runs a command	2018-01-04 08:59:52 -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
denza	e4eaab40cd	Merge branch 'develop' of github.com:saltstack/salt into profitbricks_cloudapi_v4	2018-01-04 04:32:35 +01: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
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
Nicole Thomas	8da4964545	Merge pull request #45191 from prymitive/local_cache_cleanup_fix ... Use correct path when cleaning old jobs in local_cache returner	2018-01-03 16:51:27 -05: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
denza	f21e04143b	Merge branch 'develop' of github.com:saltstack/salt into profitbricks_cloudapi_v4	2018-01-03 22:18:03 +01:00
Nicole Thomas	bb3ad9be58	Merge pull request #45119 from sumeetisp/develop ... Stop(deallocate) and Start vm actions	2018-01-03 15:14:24 -05: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
Nicole Thomas	5c5b36fc42	Merge pull request #44427 from samodid/systemd_killmode ... use KillMode=process for salt-minion.service	2018-01-03 14:37:25 -05:00