89290 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnson	3a7825618c	Fix master-side ckminions check	2017-12-23 09:19:03 -06:00
Erik Johnson	3b4b9335c3	Clarify docstring	2017-12-23 09:19:03 -06:00
Erik Johnson	bc307964d9	Add grains (and optionally pillar) to salt.cmd runner ... Not having grains was an oversight, it causes a lot of errors in processing the __virtual__ functions. Additionally, the __pillar__ dunder did not exist, so anything that referenced it would result in a traceback.	2017-12-23 09:19:03 -06:00
Nicole Thomas	16a097635a	Merge pull request #44991 from isbm/isbm-sql-pillar-bugfix ... SQL Pillar bugfix	2017-12-22 16:54:19 -05:00
Nicole Thomas	1e1dfdadc0	Merge pull request #45144 from jasperla/joyent/keyname ... update the default configuration for joyent with a keyname	2017-12-22 16:04:26 -05:00
Jasper Lievisse Adriaanse	e1bfb804de	update the default configuration for joyent with a keyname ... this parameter is mandatory as otherwise the user is presented with a puzzling HTTP 401	2017-12-22 20:09:45 +01:00
Nicole Thomas	f39731fab0	Merge branch 'oxygen' into isbm-sql-pillar-bugfix	2017-12-22 13:45:48 -05:00
Nicole Thomas	b0a23548f3	Merge pull request #45088 from twangboy/win_custom_config ... Add `/custom-config` switch to Windows installer	2017-12-22 10:19:59 -05:00
Nicole Thomas	e643de6545	Merge pull request #43892 from terminalmage/lock-mountpoints ... Fix a race condition with git_pillar mountpoints	2017-12-22 09:38:40 -05:00
Nicole Thomas	f978bf3944	Merge pull request #45131 from rallytime/merge-oxygen ... [oxygen] Merge forward from 2017.7 to oxygen	2017-12-22 09:35:02 -05:00
rallytime	9ded5e1cbb	Merge branch '2017.7' into 'oxygen' ... Conflicts: - salt/config/__init__.py - salt/grains/core.py - salt/modules/win_lgpo.py - salt/returners/mysql.py - salt/states/libcloud_dns.py - tests/integration/runners/test_runner_returns.py - tests/unit/grains/test_core.py	2017-12-21 15:58:08 -05:00
twangboy	467013a08f	Fix punctuation and erroneous characters	2017-12-21 13:11:24 -07:00
Nicole Thomas	67df35ecd3	Merge pull request #44984 from garethgreenaway/scheduler_fixes_loop_interval ... [oxygen] scheduler loop interval fixes	2017-12-21 15:11:09 -05:00
Nicole Thomas	b49ee97938	Merge pull request #45124 from gtmanfred/2017.7 ... enable using kitchen-salt with ec2 on 2017.7	2017-12-21 14:11:27 -05:00
Daniel Wallace	d0586013eb	fix pylint	2017-12-21 10:40:54 -07:00
Gareth J. Greenaway	98a9ddf10c	Merge branch 'oxygen' into scheduler_fixes_loop_interval	2017-12-21 08:36:09 -08:00
Daniel Wallace	59e2e56d13	chmod the xml files before trying to copy	2017-12-21 08:17:10 -07:00
Nicole Thomas	7dd4255ab4	Merge pull request #45115 from twangboy/win_fix_pyzmq ... Set pyzmq version to 16.0.3	2017-12-21 09:36:16 -05:00
Nicole Thomas	94ee4510fc	Merge pull request #45117 from twangboy/win_update_nsis ... Update to NSIS 3.02.1	2017-12-21 09:08:20 -05:00
twangboy	50b247a001	Update docs and help	2017-12-20 19:43:26 -07:00
twangboy	b6cecedbf6	Add timestamp to backup	2017-12-20 19:14:47 -07:00
Daniel Wallace	a5c1410e23	catch IOError when copying xml files back	2017-12-20 18:26:18 -07:00
Daniel Wallace	23bd38ad66	enable using kitchen-salt on ec2 ... These changes are needed to run the test suite on ec2 using sudo.	2017-12-20 17:18:39 -07:00
twangboy	91d343d744	Update to NSIS 3.02.1	2017-12-20 15:56:05 -07:00
twangboy	c28b7d4710	Roll back pyzmq req to 16.0.3	2017-12-20 15:41:56 -07:00
Nicole Thomas	42e894570d	Merge pull request #45087 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2016.11 to 2017.7	2017-12-20 17:24:50 -05:00
Nicole Thomas	21de54de44	Merge pull request #45105 from rallytime/utils-path-update ... Update old utils paths to new paths	2017-12-20 17:22:29 -05:00
Nicole Thomas	9550e742ac	Merge pull request #45112 from Ch3LL/fix-arch ... Fix spm big file build test to check /tmp	2017-12-20 17:09:20 -05:00
Ch3LL	1bd7110a14	Fix spm big file build test to check /tmp	2017-12-20 14:40:10 -05:00
Nicole Thomas	71f9c7ee49	Merge pull request #45068 from rallytime/bp-44976 ... Back-port #44976 to 2017.7	2017-12-20 11:31:21 -05:00
Nicole Thomas	b9503a46af	Merge pull request #45085 from rallytime/43296-follow-up ... Version added update for new boto_s3 module and state	2017-12-20 11:30:11 -05:00
rallytime	fe81e2d39a	Merge branch '2016.11' into '2017.7' ... No conflicts.	2017-12-20 10:26:10 -05:00
Nicole Thomas	7e128e8f15	Merge pull request #45100 from rallytime/bp-45070 ... Back-port #45070 to 2016.11	2017-12-20 09:55:00 -05:00
Erik Johnson	67769b8ad6	Merge pull request #45101 from rallytime/bp-45062 ... Back-port #45062 to oxygen	2017-12-20 08:41:52 -06:00
Erik Johnson	54a33c0e1d	Merge pull request #45099 from rallytime/bp-44983 ... Back-port #44983 to 2017.7	2017-12-20 08:41:21 -06:00
Erik Johnson	bdf93f339d	Merge pull request #45098 from rallytime/bp-45092 ... Back-port #45092 to 2016.11	2017-12-20 08:40:51 -06:00
rallytime	ec2a32a106	Update old utils paths to new paths	2017-12-20 08:03:14 -05:00
Michael Calmer	744e698689	adapt tests to reflect reality ... When CherryPy run with python3 it reads "bytes" from the wire. In case of python2 BytesIO == StringIO, so nothing should change. This change will do the same to make unit tests reflect reality.	2017-12-20 06:59:56 -05:00
Michael Calmer	9fa126f664	cherrypy read() reads bytes from the wire and write them into contents var	2017-12-20 06:59:49 -05:00
Vernon Cole	0bdb46dab9	add clouds modules to index	2017-12-20 06:58:09 -05:00
Victor	23361de8a2	Ref:44961 - Modified archive.tar to add dest argument at the end of the tar cmd.	2017-12-20 06:56:19 -05:00
Erik Johnson	80b6bd6813	Fix integration.states.test_pip.PipStateTest.test_pip_installed_weird_install ... Carbon 1.1.1 for some reason added six to their setup.py, which breaks this test since it's not installed into the virtualenv. This PR forces this test to use a version of carbon which does not dep on six in its setup.py.	2017-12-20 06:54:30 -05:00
Nicole Thomas	dafd2fc61f	Merge pull request #45083 from Ch3LL/gce_test_fix ... Force gce cloud test name to be lowercase	2017-12-20 06:46:23 -05:00
Nicole Thomas	19997e4d81	Merge pull request #45092 from terminalmage/fix-pip-test ... Fix integration.states.test_pip.PipStateTest.test_pip_installed_weird_install	2017-12-20 05:52:08 -05:00
Nicole Thomas	b1dc0de02f	Merge pull request #45038 from terminalmage/fix-missing-exc ... docker_image: Fix missing exc in except, pass proper args to docker.build	2017-12-19 19:50:21 -05:00
Erik Johnson	109c9936d3	Fix integration.states.test_pip.PipStateTest.test_pip_installed_weird_install ... Carbon 1.1.1 for some reason added six to their setup.py, which breaks this test since it's not installed into the virtualenv. This PR forces this test to use a version of carbon which does not dep on six in its setup.py.	2017-12-19 18:37:59 -06:00
Erik Johnson	7a60cfd171	Clear Python 2 .pyc files when Python 3 suite runs ... This prevents import errors when Python 2 .pyc files exist and the test suite is run under Python 3.	2017-12-19 15:35:10 -06:00
Erik Johnson	e65237c390	Update test to match how file.append works	2017-12-19 15:34:31 -06:00
Erik Johnson	4501d0d6f9	Fix nested structure test for py2 and py3	2017-12-19 15:34:11 -06:00
Erik Johnson	52903e2f09	Handle non-strings passed to exception constructors	2017-12-19 15:33:07 -06:00