89597 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	efc75677e1	Merge pull request #45385 from cloudflare/o2-utils-refactor ... Document the utils refactor	2018-01-11 09:42:30 -05:00
Mircea Ulinic	7fad2f8c0c	Document the utils refactor	2018-01-11 09:59:38 +00:00
Nicole Thomas	96113c05ee	Merge pull request #45145 from jasperla/openbsdpkg/upgrade ... openbsdpkg.upgrade: implement pkg.upgrade for OpenBSD	2018-01-09 16:54:16 -05:00
Nicole Thomas	57b686033a	Merge pull request #45164 from jasperla/vmctl ... New vmctl module to interface with the OpenBSD VMM hypervisor	2018-01-09 15:04:44 -05:00
Nicole Thomas	4d1a324873	Merge pull request #44987 from StackPointCloud/profitbricks_cloudapi_v4 ... ProfitBricks Cloud API v4 support	2018-01-09 15:03:57 -05:00
Jasper Lievisse Adriaanse	2a5c10c3ba	openbsdpkg.upgrade: implement pkg.upgrade for OpenBSD ... this allows to upgrade all packages, a single package or a selection of packages	2018-01-09 19:35:38 +01:00
Nicole Thomas	144c34b505	Merge branch 'develop' into profitbricks_cloudapi_v4	2018-01-09 11:55:16 -05:00
Nicole Thomas	803ed52c33	Merge branch 'develop' into vmctl	2018-01-09 09:36:35 -05:00
Nicole Thomas	0c9183ef8f	Merge pull request #45248 from epcim/saltclass-followlinks ... Fix - Enable saltclass to follow symlinks on path.os_walk	2018-01-09 08:42:45 -05:00
Nicole Thomas	b0c1054dc9	Merge branch 'develop' into saltclass-followlinks	2018-01-08 16:32:54 -05:00
Nicole Thomas	9cb6ac3be0	Merge pull request #45229 from garethgreenaway/30161_using_unless_onlyif_together ... [develop] Allow the onlyif & unless requisites in a state file.	2018-01-08 16:00:49 -05:00
denza	7adf68123f	Merge branch 'develop' of github.com:saltstack/salt into profitbricks_cloudapi_v4	2018-01-08 21:43:37 +01:00
Nicole Thomas	47bdea2c48	Merge pull request #45272 from garethgreenaway/scheduler_next_fire_time_when_disabled ... [develop] Updates to scheduler for disabled jobs	2018-01-08 12:43:45 -05:00
Nicole Thomas	45903a7d76	Merge pull request #45224 from alexandruavadanii/ppa-use-proxy ... aptpkg: apt-add-repository: Use proxy for PPA	2018-01-08 12:39:38 -05:00
Nicole Thomas	b6ba33121e	Merge branch 'develop' into 30161_using_unless_onlyif_together	2018-01-08 12:34:58 -05:00
Gareth J. Greenaway	846fed6735	Merge pull request #45307 from rallytime/stale-config-update ... Reduce the number of days an issue is stale by 10	2018-01-08 09:22:28 -08:00
Nicole Thomas	1e8d15b220	Merge pull request #45163 from xiaosazixian/develop ... Fixes #45162	2018-01-08 12:04:27 -05:00
zhangxian	1d4990e540	Merge branch 'develop' of https://github.com/xiaosazixian/salt into develop	2018-01-08 09:41:40 +08:00
zhangxian	db92ce98dc	use spaces instead of tabs	2018-01-08 09:41:07 +08:00
zhangxian	d6e8059603	Merge remote-tracking branch 'salt/develop' into develop	2018-01-08 09:38:33 +08:00
rallytime	96d36b8056	Reduce the number of days an issue is stale by 10	2018-01-05 17:27:18 -05:00
denza	b124fc2123	Merge branch 'develop' of github.com:saltstack/salt into profitbricks_cloudapi_v4	2018-01-05 19:43:55 +01:00
Nicole Thomas	e0434bb62a	Merge pull request #43901 from sitepoint/cmd_group_feature ... cmdmod: New group option for command execution & MacOS shell arg fix	2018-01-05 12:41:02 -05:00
Nicole Thomas	5795201ad6	Merge pull request #45281 from rallytime/merge-develop ... [develop] Merge forward from oxygen to develop	2018-01-05 12:39:45 -05:00
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
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
rallytime	153b8d4ebb	Merge branch 'oxygen' into 'develop' ... No conflicts.	2018-01-04 17:46:52 -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
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
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	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
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
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
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