86221 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
rallytime	e9d09e0375	Use old is_windows utils path on 2017.7	2018-06-25 10:06:37 -04:00
Daniel Wallace	b965d6c9b3	If pip binary is passed to bin_env, use that pip binary ... We don't need to do a lookup for python to then run `python -m pip` because we already know where pip is. Fixes using /bin/pip3 Fixes #48122	2018-06-19 14:09:11 -04:00
Nicole Thomas	12e2b8882a	Merge pull request #48201 from zer0def/lxc-bootstrap-fixes ... Fixes to LXC bootstrap when alternate lxcpath is provided.	2018-06-19 08:56:39 -04:00
zer0def	6f6d3d40d4	Take lxcpath into account when bootstrapping new containers. Version comparison fixes.	2018-06-19 12:57:12 +02:00
Nicole Thomas	e079fce38d	Merge pull request #48190 from terminalmage/fix-vfstab-test ... Fix mount.vfstab unit test	2018-06-18 17:47:54 -04:00
Nicole Thomas	c8b9cec986	Merge pull request #48115 from KaiSforza/pr-lint-2017 ... Add jenkinsfiles to define tests in 2017	2018-06-18 17:27:39 -04:00
Nicole Thomas	fc1752b721	Merge pull request #48174 from terminalmage/docker-update-mine ... Add docker.update_mine config option	2018-06-18 15:04:53 -04:00
Erik Johnson	8d70d14362	Fix mount.vfstab unit test ... This test was calling mount.fstab() instead of mount.vfstab()	2018-06-18 13:21:40 -05:00
Erik Johnson	9af09e0127	Mock config.get due to changes in _refresh_mine_cache	2018-06-18 00:05:25 -05:00
Erik Johnson	c5802ad465	Fix the version number in versionadded ... 2017.7.7 has already been released	2018-06-17 21:47:33 -05:00
Erik Johnson	d403ae58d7	Add unit test for docker.update_mine	2018-06-17 21:42:28 -05:00
Erik Johnson	44c275698a	Actually it's more than just add/remove that updates the mine	2018-06-17 21:16:09 -05:00
Erik Johnson	0cb6996b07	Add release notes mention of docker.update_mine config option	2018-06-17 21:11:05 -05:00
Erik Johnson	de05097b20	Add docs for new config option	2018-06-17 21:10:50 -05:00
Erik Johnson	04c55a9178	Add note in mine.get_docker docstring about new config item	2018-06-17 21:10:17 -05:00
Erik Johnson	4e456255c0	Allow mine update to be disabled using new config option	2018-06-17 21:04:33 -05:00
Nicole Thomas	df2a156338	Merge pull request #48061 from garethgreenaway/port_47049_2017_7 ... [2017.7] Porting #47049 to 2017.7.	2018-06-15 13:15:49 -04:00
Nicole Thomas	5ec3cf2dd4	Merge pull request #48143 from Ch3LL/fix_long_job ... Add timeout argument to run_salt for ShellCase	2018-06-15 13:04:56 -04:00
Nicole Thomas	e1e566d1f8	Merge pull request #48135 from rallytime/release-notes-2017.7 ... Update the 2017.7.7 and 2017.7.8 release notes	2018-06-14 17:22:06 -04:00
Ch3LL	48b5d2e9d3	Add timeout argument to run_salt for ShellCase	2018-06-14 16:19:33 -04:00
Nicole Thomas	ac9dabbfaa	Merge pull request #48105 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2017.7.6 to 2017.7	2018-06-14 13:00:08 -04:00
rallytime	7a97f157b3	Add missing v for tag reference	2018-06-14 12:10:18 -04:00
rallytime	2f2b69ed37	Add "in progress" notation to 2017.7.7 release notes	2018-06-14 12:08:47 -04:00
rallytime	06a1151a63	Add release notes file for 2017.7.7	2018-06-14 12:06:04 -04:00
rallytime	885b2862ce	Move 2017.7.7 release notes to 2017.7.8	2018-06-14 12:05:37 -04:00
Nicole Thomas	2da56a69d9	Merge pull request #48101 from rallytime/update-doc-refs-2017.7 ... [2017.7] Update 2017.7.7 reference to 2017.7.8	2018-06-14 09:14:08 -04:00
William Giokas	494727ab39	Add docs, kitchen tests ... Also remove a pwd call from the lint, we don't need it anymore.	2018-06-13 16:41:27 -06:00
William Giokas	317023bb20	Move .jenkins to .ci for future	2018-06-13 16:41:27 -06:00
William Giokas	dedc313cee	Make it parallel so we don't fail right away	2018-06-13 16:41:27 -06:00
William Giokas	cd13426726	Add a .jenkins file to run pylint	2018-06-13 16:41:27 -06:00
rallytime	cdb45874de	Merge branch '2017.7.6' into '2017.7' ... Conflicts: - doc/topics/releases/2017.7.6.rst - requirements/base.txt	2018-06-13 15:04:55 -04:00
rallytime	7ba6f5fb36	Update 2017.7.7 reference to 2017.7.8	2018-06-13 14:35:34 -04:00
Nicole Thomas	5a0e3d46e7	Merge pull request #48091 from terminalmage/fix-file_roots-monkeypatching ... Reverse monkeypatching after test_symlink_list finishes	2018-06-13 14:02:52 -04:00
Gareth J. Greenaway	7c472fed51	Fixing failing test_set_hwclock_aix test.	2018-06-13 10:15:28 -07:00
Gareth J. Greenaway	ccb0acc958	Porting #47049 to 2017.7.	2018-06-13 10:15:28 -07:00
Erik Johnson	6fe711ad76	Reverse monkeypatching after test_symlink_list finishes ... On Windows, in test_symlink_list we monkeypatch the file_roots. However, we don't ever reverse that monkeypatching. This would not have affected other test classes, because the opts we are monkeypatching are ones created specifically for that test class. And due to the lexicographic order in which the tests are run, test_symlink_list is run last. However, if we were to ever add a test to that test class which would run after test_symlink_list, it would be affected by the monkeypatching.	2018-06-13 09:58:29 -05:00
Nicole Thomas	053b019a8f	Merge pull request #48088 from rallytime/update_version_doc_2017.7 ... Update release versions for the 2017.7 branch	2018-06-13 10:03:02 -04:00
rallytime	1b8d1c936b	Remove "in progress" info for 2017.7.6 release notes	2018-06-13 09:49:47 -04:00
rallytime	9a0f4d190a	Update release versions for the 2017.7 branch	2018-06-13 09:47:12 -04:00
Nicole Thomas	d6d2c5ee18	Merge pull request #48075 from garethgreenaway/48038_jobs_are_not_deduping_minion_side ... [2017.7] Ensure that the shared list of jids is passed	2018-06-13 09:25:34 -04:00
Nicole Thomas	aa33cc0b0c	Merge pull request #48071 from terminalmage/gitfs-docs ... Fix inaccurate gitfs_saltenv example in GitFS Walkthrough	2018-06-12 16:34:12 -04:00
Gareth J. Greenaway	c537b3275b	Ensure that the shared list of jids is passed when creating the Minion. Fixes an issue when minions are pointed at multiple syndics.	2018-06-12 13:07:44 -07:00
Nicole Thomas	fb4ceacb88	Merge pull request #48053 from rallytime/bp-48040 ... Back-port #48040 to 2017.7	2018-06-12 10:46:11 -04:00
Erik Johnson	24545204b3	Fix inaccurate gitfs_saltenv example in GitFS Walkthrough	2018-06-12 09:25:53 -05:00
Daniel Wallace	f37dcaac6d	Merge pull request #48024 from gtmanfred/2017.7 ... add pytest coverage and xml junits	2018-06-12 09:03:25 -05:00
Todd Wells	265b22b194	states/github.py fix for incorrect positional argument	2018-06-11 11:23:58 -04:00
Nicole Thomas	ffee3576ec	Merge pull request #48044 from twangboy/wua_add_fail_code ... Add fail code for WinHTTP send/receive error	2018-06-11 09:49:28 -04:00
twangboy	d41d0c25eb	Add faile code for WinHTTP send/receive error	2018-06-08 17:31:43 -06:00
Nicole Thomas	871a910fcb	Merge pull request #48009 from dwoz/winswarmfix ... minionswarm runs on windows	2018-06-08 09:52:35 -04:00
Daniel Wallace	56b074ab27	allow specifying a different state to run on converge	2018-06-07 15:49:54 -05:00