85961 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Wallace	0d06da6944	Merge pull request #47626 from gtmanfred/2017.7 ... Implement Pipfile and remove extra requirements.txt files	2018-05-15 19:03:11 -05:00
Nicole Thomas	a07a8906a0	Merge pull request #47578 from Ch3LL/mac_service_disabled ... Ensure mac_service.disabled is correctly querying services	2018-05-15 14:26:36 -04:00
Daniel Wallace	418364a533	make dev_python27.txt have the same message as dev_python34.txt	2018-05-15 12:29:52 -05:00
Ch3LL	6032a01f55	change disable check for upstart service on ubuntu14	2018-05-15 12:07:27 -04:00
Nicole Thomas	f63d801858	Merge pull request #47639 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2017.7.6 to 2017.7	2018-05-14 13:58:24 -04:00
Nicole Thomas	db0eef3e8b	Merge pull request #47643 from dwoz/runas_detect ... Remove unwanted file	2018-05-14 13:53:56 -04:00
Daniel A. Wozniak	8c5e54b8b3	Fix typo	2018-05-14 10:30:04 -07:00
Daniel A. Wozniak	69bc88f1c6	Remove unwanted file	2018-05-14 09:48:31 -07:00
Daniel Wozniak	6dd3ab9f06	Merge pull request #47601 from dwoz/runas_detect ... Skip tests when we can not use runas	2018-05-14 08:26:35 -07:00
Daniel A. Wozniak	3235ac08cb	use ignore-undefined-variable	2018-05-14 08:26:01 -07:00
rallytime	1503f1020f	Merge branch '2017.7.6' into '2017.7' ... No conflicts.	2018-05-14 10:56:21 -04:00
Daniel Wallace	d53b44d10f	remove lock file	2018-05-13 14:35:50 -04:00
Daniel Wallace	493ed7f93d	use the toml dict format	2018-05-13 14:35:23 -04:00
Daniel Wallace	e0f7cc1447	add proxy tests decorator to pytest conftest	2018-05-13 08:38:38 -04:00
Daniel Wallace	0a621dd0ec	add Pipfile for managing dependencies in salt	2018-05-13 08:38:38 -04:00
Daniel Wallace	f78b81db94	simplify dev and base.txt to single files ... Instead of having different files for different python versions, just have one, and use the built in `python_version` to handle which dependencies to install.	2018-05-13 08:38:34 -04:00
Mike Place	f61ccae627	Merge pull request #47611 from Ch3LL/deb_doc ... Update debian install docs to reflect new latest debian releases	2018-05-11 11:32:52 -05:00
Mike Place	6d2ddd050f	One more grammar fixup	2018-05-11 11:32:33 -05:00
Mike Place	2d5ff01261	Grammar fix	2018-05-11 09:18:55 -05:00
Ch3LL	138847c9c4	Update debian install docs to reflect new latest debian releases	2018-05-11 09:51:50 -04:00
Daniel A. Wozniak	58911d510a	Ignore pylint WindowsError	2018-05-11 01:37:12 -07:00
Nicole Thomas	9e2fe284e4	Merge pull request #47598 from rallytime/bp-47568-2017.7 ... Back-port #47568 to 2017.7	2018-05-10 18:06:19 -04:00
Nicole Thomas	8a7913ccc3	Merge pull request #47548 from Ch3LL/syslog ... Catch Sysloghandler errors when log file does not exist	2018-05-10 16:23:24 -04:00
Ch3LL	33b4cfbc5b	Change service assertion check for systemd platforms	2018-05-10 16:16:39 -04:00
Daniel A. Wozniak	17987d3c5a	Better doc string	2018-05-10 12:11:45 -07:00
Daniel A. Wozniak	a48ac26573	Skip tests when we can not use runas	2018-05-10 12:06:56 -07:00
Nicole Thomas	82fb6ba366	Merge pull request #47508 from gtmanfred/2017.7 ... allow pulling the mysql_query.run_file to pull from the fileserver	2018-05-10 14:12:27 -04:00
Ch3LL	31f13a4197	sysloghander: check for 3.5.4 python version	2018-05-10 14:12:15 -04:00
Erik Johnson	09458c65cf	Add exception logging on serialize/deserialize exceptions ... Since we are reraising an error using our own exception classes, we lose the traceback. This adds exception logging to provide useful information to troubleshoot errors encountered while serializing/deserializing.	2018-05-10 12:57:44 -04:00
Erik Johnson	c62c855f9c	salt.serializers.yaml/yamlex: remove invalid multi_constructor ... The first argument to add_multi_constructor must be a YAML tag. This is because when PyYAML looks for a constructor to match the tag (in order to get the function to use for deserialization) it matches the tag using `.startswith()`. Thus, when this is attempted using a constructor with a tag value of `None`, an error is raised. The ordering of the list of multi_constructors in the Loader object appears to differ from platform to platform, which explains why this only caused the unit tests to fail on one or two platforms. If a tag match is found, then PyYAML stops iterating through the list of multi_constructors, so this invalid one has been able to stay in Salt without causing any noticeable trouble until now.	2018-05-10 12:57:37 -04:00
Nicole Thomas	be29b58a09	Merge pull request #47562 from rallytime/bp-47513 ... Back-port #47513 to 2017.7	2018-05-10 11:19:03 -04:00
Mike Place	6f178ca908	Merge pull request #47570 from gtmanfred/2017.7.6 ... Update dependency to msgpack	2018-05-10 08:23:08 -05:00
Ch3LL	14896f9743	change codeauthor and class name	2018-05-09 17:48:59 -04:00
Ch3LL	502c5bdff5	Ensure mac_service.disabled is correctly querying services	2018-05-09 17:12:50 -04:00
Nicole Thomas	d3121fcfa4	Merge pull request #47471 from meaksh/2017.7-fix-inconsistent-scheduled-jid-with-returners ... Fix inconsistency with "jid" on minion scheduled jobs and the returners output	2018-05-09 14:20:00 -04:00
Daniel Wallace	84aa034e03	Update dependency to msgpack	2018-05-09 12:47:07 -05:00
Nicole Thomas	662f6086db	Merge pull request #47313 from Circuitsoft/2017.7 ... Add Poky/Yocto support	2018-05-09 13:31:58 -04:00
Pablo Suárez Hernández	f079939500	Do not override jid on returners, only sending back to master	2018-05-09 16:36:42 +01:00
Frankie Hui	357bc084b3	fix #46546	2018-05-09 11:06:13 -04:00
Nicole Thomas	237560b745	Merge branch '2017.7' into 2017.7	2018-05-09 10:56:25 -04:00
Nicole Thomas	291d3d3bd8	Merge pull request #47540 from terminalmage/cmdmod-home-fix ... Fix corner case where runas user's HOME env value is incorrect	2018-05-08 16:31:39 -04:00
Nicole Thomas	49af577b3e	Merge pull request #47547 from terminalmage/gitfs-tutorial ... Add masterless mode docs to gitfs tutorial	2018-05-08 16:24:28 -04:00
Ch3LL	a020352a03	Catch Sysloghandler errors when log file does not exist	2018-05-08 15:12:35 -04:00
Erik Johnson	806ffb298a	Add masterless mode docs to gitfs tutorial	2018-05-08 13:46:47 -05:00
Nicole Thomas	476ba053d1	Merge pull request #47538 from terminalmage/pip-docs ... Fix/clarify some of the pip module documentation	2018-05-08 11:24:17 -04:00
Mike Place	7cc8d9d30a	Merge pull request #47524 from dwoz/whitelistlines ... Gracefully handle blank lines in whitelist.txt	2018-05-08 10:04:22 -05:00
Erik Johnson	e4b277f82e	Fix corner case where runas user's HOME env value is incorrect ... In the test suite, two of the failing `pip.installed` tests were failing because when we shelled out to get the user's environment, the `HOME` environment variable's value was incorrectly showing the root user's home dir. This change ensures that we use the correct value for the HOME environment variable when running a command as another user.	2018-05-08 08:42:02 -05:00
Nicole Thomas	98bd598701	Merge pull request #47523 from rallytime/man-pages ... [2017.7.6] Update man pages	2018-05-08 09:31:18 -04:00
Erik Johnson	98e8ffeba4	Fix/clarify some of the pip module documentation	2018-05-08 08:13:25 -05:00
Daniel Wozniak	f1a5b13072	Merge pull request #47527 from dwoz/test_file_name ... Test file name	2018-05-07 15:02:03 -07:00