81895 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnson	5c970d81e5	Fix runtests_helpers.modules_available when multiple modules passed ... tests.support.helpers passes the single-asterisk tuple of args as individual arguments to runtest_helpers.modules_available. This breaks tests which pass more than one argument to the requires_salt_modules decorator. This has been fixed by making runtests_helpers.modules_available accept an arbitrary number of args via using a single-asterisk.	2017-06-14 13:16:30 -05:00
Mike Place	10b68e9375	Merge pull request #41698 from rallytime/flaky-decorator-tcp-test ... Add flaky decorator to test_badload in tcp unit tests	2017-06-13 16:13:44 -05:00
Nicole Thomas	2524218e25	Merge pull request #41718 from rallytime/merge-nitrogen ... [nitrogen] Merge forward from 2016.11 to nitrogen	2017-06-13 12:11:25 -06:00
rallytime	bdf33d7f5f	Merge branch '2016.11' into 'nitrogen' ... No conflicts.	2017-06-13 09:26:05 -06:00
Nicole Thomas	1afc4adc5a	Merge pull request #41710 from rallytime/merge-2016.11 ... [2016.11] Merge forward from 2016.3 to 2016.11	2017-06-13 09:11:37 -06:00
rallytime	5150916556	Merge branch '2016.3' into '2016.11' ... Conflicts: - salt/modules/parted.py	2017-06-12 20:10:45 -06:00
Nicole Thomas	5d763b9b7f	Merge pull request #41702 from gtmanfred/2016.11 ... npm 5 and greater requires --force for cache clean	2017-06-12 17:21:55 -06:00
Nicole Thomas	f6519e7f80	Merge pull request #41704 from rallytime/bp-41670 ... Back-port #41670 to 2016.11	2017-06-12 17:20:31 -06:00
Nicole Thomas	5058b0de1f	Merge pull request #41707 from terminalmage/master-tops-docs ... Update version in master-tops docs	2017-06-12 17:18:43 -06:00
Erik Johnson	6ec9dfb7f3	Update version in master-tops docs ... This paragraphs is referring to #37322, which was pushed to Oxygen.	2017-06-12 17:20:09 -05:00
Nicole Thomas	1c1964d807	Merge pull request #41689 from yannj-fr/fix-41688 ... Fix #41688 : fix mkfs command linux-swap support	2017-06-12 16:09:50 -06:00
Nicole Thomas	0b89377dce	Merge pull request #41700 from terminalmage/issue39939 ... roots: return actual link destination when listing symlinks	2017-06-12 16:07:03 -06:00
Daniel Wallace	8bd19fcc17	fix version number	2017-06-12 16:05:57 -06:00
Nicole Thomas	740e933028	Merge pull request #41703 from gtmanfred/nitrogen ... mark all mac power tests as flaky	2017-06-12 16:03:15 -06:00
Daniel Wallace	0fa380f75c	npm 5 and greater requires --force for cache clean ... This is the error ``` npm ERR! As of npm@5, the npm cache self-heals from corruption issues and data extracted from the cache is guaranteed to be valid. If you want to make sure everything is consistent, use 'npm cache verify' instead. npm ERR! npm ERR! If you're sure you want to delete the entire cache, rerun this command with --force. ```	2017-06-12 14:48:43 -06:00
Yann Jouanin	8afc8792d1	fixes #41668 ntfs case problem in parted module	2017-06-12 14:40:41 -06:00
Nicole Thomas	600a3ec16e	Merge pull request #41685 from terminalmage/py3-tests ... Update orphan finding code to handle differences in psutil on PY3	2017-06-12 14:34:00 -06:00
Erik Johnson	7cf47f9651	Merge pull request #41699 from rallytime/troubleshooting-doc-update ... Remove note about version incompatibility with salt-cloud	2017-06-12 14:44:28 -05:00
Daniel Wallace	b202505923	mark all mac power tests as flaky ... After talking to @cro, all of the mac power modules became super flaky in Sierra. Because of this, I am marking all of the mac power tests with the flaky decorator.	2017-06-12 13:34:12 -06:00
Nicole Thomas	d68a6316b8	Merge pull request #41694 from rallytime/fix-40410 ... Add ipcidr options to "Allowed Values" list in LocalClient expr_form docs	2017-06-12 13:06:15 -06:00
Nicole Thomas	435d6189bf	Merge pull request #41446 from cloudflare/proxy-file ... [backport] salt-proxy: Fix systemd unit file to handle more proxy names	2017-06-12 12:33:20 -06:00
garethgreenaway	80d4a3ab98	Merge pull request #41659 from lubyou/41365-fix-file-managed ... Use re.escape to escape paths before handing them to re.match	2017-06-12 11:10:52 -07:00
Erik Johnson	bdbb265a0b	roots: return actual link destination when listing symlinks ... This fixes a regression in file.recurse, as the relative path on the fileserver is usually not the actual link destination.	2017-06-12 12:25:28 -05:00
rallytime	c91ca5f809	Remove note about version incompatibility with salt-cloud ... The note references very old versions of salt + salt-cloud and since salt-cloud has been incorporated into salt for quite some time, this notice is no longer needed.	2017-06-12 11:16:52 -06:00
rallytime	67f0c17da3	Add flaky decorator to test_badload in tcp unit tests	2017-06-12 11:10:22 -06:00
rallytime	6de9da1d5d	Add ipcidr options to "Allowed Values" list in LocalClient expr_form docs ... Fixes #40410	2017-06-11 21:38:45 -06:00
Nicole Thomas	f41919ea09	Merge pull request #41686 from rallytime/merge-nitrogen ... [nitrogen] Merge forward from 2016.11 to nitrogen	2017-06-11 20:43:09 -06:00
Yann Jouanin	a47eddccd2	Fix #41688 : fix mkfs command linux-swap support	2017-06-11 12:00:16 +02:00
rallytime	446ecdad63	Merge branch '2016.11' into 'nitrogen' ... No conflicts.	2017-06-09 15:16:16 -06:00
Nicole Thomas	d91a26f75b	Merge pull request #41683 from cachedout/issue_41678 ... Fix librato returner to not log in virtual	2017-06-09 14:37:09 -06:00
Erik Johnson	a29b458416	Update orphan finding code to handle differences in psutil on PY3 ... This should fix the remainder of the test flakiness for integration.shell.test_proxy.ProxyTest.test_exit_status_correct_usage	2017-06-09 15:20:23 -05:00
Mike Place	b0747ee177	Fix librato returner to not log in virtual	2017-06-09 12:55:02 -06:00
Nicole Thomas	a00e943db8	Merge pull request #41674 from rallytime/bp-41580 ... Back-port #41580 to nitrogen	2017-06-09 12:48:14 -06:00
Gareth J. Greenaway	08a92e041e	Removing rogue file that shouldn't be referenced	2017-06-09 09:16:09 -06:00
Gareth J. Greenaway	53a216378c	Fixing the last text failure.	2017-06-09 09:16:09 -06:00
Gareth J. Greenaway	4d3399c6c4	Couple more typos, assert not asset.	2017-06-09 09:16:09 -06:00
Gareth J. Greenaway	14a903ef61	Fixing typo in assertSaltTrueReturn, assertSaltFalseReturn and assertSaltNoneReturn.	2017-06-09 09:16:09 -06:00
Gareth J. Greenaway	a531d01b26	Updating the assert tests for develop based on changes from 41569.	2017-06-09 09:16:09 -06:00
Nicole Thomas	564d5fd9d3	Merge pull request #41661 from whiteinge/rest_cherrypy-keys-headers ... Add note about avoiding the `-i` flag for the /keys endpoint	2017-06-09 09:03:39 -06:00
Nicole Thomas	55ac7312bf	Merge pull request #41657 from gtmanfred/nitrogen ... Disable libcloud test if the module doesn't load	2017-06-09 08:58:06 -06:00
Nicole Thomas	f3f76f9b86	Merge pull request #41665 from rallytime/merge-nitrogen ... [nitrogen] Merge forward from 2016.11 to nitrogen	2017-06-09 08:57:08 -06:00
Nicole Thomas	38424f3e3e	Merge pull request #41660 from garethgreenaway/41651_fixing_aptpkg_held_unheld_with_test ... Fix to modules/aptpkg.py for unheld	2017-06-09 08:53:22 -06:00
rallytime	093f96f84e	Merge branch '2016.11' into 'nitrogen' ... No conflicts.	2017-06-08 16:45:34 -06:00
Nicole Thomas	a308b960d8	Merge pull request #41656 from rallytime/bp-41575 ... Back-port #41575 to 2016.11	2017-06-08 16:43:22 -06:00
Nicole Thomas	c292b1161f	Lint: quick fix to add missing blank line	2017-06-08 16:04:59 -06:00
Nicole Thomas	4374e6b034	Replace "tbd" with release version information	2017-06-08 15:43:33 -06:00
Seth House	a66ffc9d3e	Add note about avoiding the -i flag for the /keys endpoint	2017-06-08 13:56:01 -06:00
rallytime	81413896d1	Lint: Add index numbers to format {} calls	2017-06-08 12:32:00 -06:00
Gareth J. Greenaway	30da2370a4	Fix when test=True and packages were being set to unheld.	2017-06-08 11:21:35 -07:00
Mike Place	e6d37b5f3e	Merge pull request #41456 from bdrung/fix-pkgrepo.managed-changes-check ... Fix pkgrepo.managed always return changes for test=true	2017-06-08 13:21:04 -05:00