85923 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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
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
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
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
Daniel A. Wozniak	4aea7ca571	Update doc string	2018-05-07 14:41:20 -07:00
Daniel A. Wozniak	b3289e5a1c	Fix test file name	2018-05-07 14:40:15 -07:00
Daniel A. Wozniak	2605ff8712	Gracefully handle blank lines in whitelist.txt	2018-05-07 13:35:00 -07:00
Nicole Thomas	e9c1723175	Merge pull request #47408 from Ch3LL/skip_diskusage ... Skip status.diskusage integration tests on macsox	2018-05-07 15:06:56 -04:00
Nicole Thomas	2f50ff7bc8	Merge pull request #47480 from baniobloom/ConflictingDomainExists ... added handling for the aws error ConflictingDomainExists	2018-05-07 15:05:27 -04:00
Mike Place	068da8ad7d	Merge branch '2017.7' into skip_diskusage	2018-05-07 09:20:38 -05:00
Mike Place	7f53be6e92	Merge pull request #47444 from terminalmage/render_state-spurious-error ... Skip trying to render a template for a nonexistant SLS file	2018-05-07 08:48:23 -05:00
Daniel Wallace	1a87e7455f	allow pulling the mysql_query.run_file to pull from the fileserver	2018-05-07 08:32:32 -05:00
Mike Place	50b9c4d79d	Merge pull request #47478 from terminalmage/rename-pip-state-test ... Rename pip state test modules to match naming convention	2018-05-07 08:13:12 -05:00
Mike Place	e78ac0f9b7	Merge pull request #47505 from dwoz/win_dsc_fixes ... Raise proper invocation errors	2018-05-07 08:05:22 -05:00
Daniel A. Wozniak	d1fcb40d1c	Raise proper invocation errors	2018-05-06 14:58:46 -07:00
Daniel Wallace	0d4d5047d8	Merge pull request #47499 from dwoz/win_run_timeout_again ... Move kill process tree and re-use it	2018-05-06 15:54:21 -05:00
Daniel A Wozniak	c6697b9f16	Move kill process tree and re-use it	2018-05-06 09:44:55 -07:00
Daniel Wozniak	6a4d0380b1	Merge pull request #47493 from dwoz/win_run_timeout ... Add support for windows timeout to run_salt	2018-05-05 22:34:30 -07:00
Daniel A Wozniak	fec1233dc4	Add support for windows timeout to run_salt ... The run_salt function needs to support timeout on windows for the full test suite to run.	2018-05-05 15:10:14 -07:00
Banio Carpenter	d22ed7dffa	added handling for the aws error ConflictingDomainExists	2018-05-04 15:11:56 -05:00
Erik Johnson	9f7a9ebebd	Rename pip state test modules to match naming convention ... This makes the naming match the naming convention used throughout the test suite and will make the changes in https://github.com/saltstack/salt/pull/47337 work better.	2018-05-04 15:03:44 -05:00
Daniel Wallace	611ca1fc03	Merge pull request #47476 from gtmanfred/2017.7 ... Specify the cache directory for newer virtualenv modules	2018-05-04 14:20:44 -05:00
Daniel Wallace	1f91a85587	specify cache dir for pip install	2018-05-04 12:48:52 -05:00
Nicole Thomas	7c3f2c56da	Merge pull request #47412 from twangboy/fix_47125 ... Fix issue where the cwd was being removed	2018-05-04 13:28:10 -04:00
Nicole Thomas	4846e957c4	Merge pull request #47467 from twangboy/cleanup_settings ... Remove unused settings, update NSIS	2018-05-04 13:11:37 -04:00
Daniel Wallace	99e150e09c	check for kitchen-vagrant gem before loading windows tests	2018-05-04 09:45:53 -05:00
Nicole Thomas	da9871d36b	Merge pull request #47196 from twangboy/fix_47024 ... Fix issues with pip	2018-05-04 10:23:03 -04:00
Mike Place	c9bab0b8e3	Merge branch '2017.7' into fix_47125	2018-05-04 09:14:06 -05:00
Nicole Thomas	e8c4524bae	Merge pull request #47455 from Ch3LL/unreleased_rn ... Add In Progress Warning for 2017.7.6 Release Notes	2018-05-04 09:44:54 -04:00
twangboy	9d498293b1	Remove unused settings, update NSIS	2018-05-03 16:46:03 -06:00
Nicole Thomas	2c7a4b6179	Merge pull request #47459 from gtmanfred/2017.7 ... update ubuntu-rolling to 18.04	2018-05-03 16:39:19 -04:00
Nicole Thomas	64a64c0ed7	Merge pull request #47462 from terminalmage/docs ... Fix docs build on Sphinx 1.7+	2018-05-03 16:06:56 -04:00
Erik Johnson	6d7803ece0	Fix docs build on Sphinx 1.7+ ... Sphinx 1.7 got rid of sphinx.utils.compat. This commit allows the builds to work both on both older and newer Sphinx.	2018-05-03 13:31:34 -05:00
Daniel Wallace	d228e72477	update ubuntu-rolling to 18.04	2018-05-03 12:02:22 -05:00
Ch3LL	b6d0cc2ab7	Add In Progress Warning for 2017.7.6 Release Notes	2018-05-03 12:06:15 -04:00
Nicole Thomas	6cd0d31c03	Merge pull request #47438 from lomeroe/double_admx_test ... lgpo fix for issue #47436	2018-05-03 10:40:26 -04:00
Alex Austin	cb674fb1cb	Enable opkg as pkgrepo handler on Poky	2018-05-02 20:32:54 -05:00
Alex Austin	7a58fd157e	Enable opkg on non-NILinuxRT systems	2018-05-02 20:32:54 -05:00
Alex Austin	139360c55f	Add Poky to OS Information Grains	2018-05-02 20:32:54 -05:00