82899 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	c6ca7d639f	Merge pull request #42889 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2016.11 to 2017.7	2017-08-14 10:16:19 -04:00
Nicole Thomas	4b6fe2ee59	Merge pull request #42898 from mirceaulinic/patch-11 ... Minor eos doc correction	2017-08-14 09:42:20 -04:00
Mircea Ulinic	93be79a135	Index eos under the installation instructions list	2017-08-12 23:15:11 +01:00
Mircea Ulinic	f903e7bc39	Minor eos doc correction	2017-08-12 23:11:25 +01:00
rallytime	fb7117f2ac	Use salt.utils.versions.LooseVersion instead of distutils	2017-08-11 16:31:24 -04:00
Erik Johnson	1764878754	Merge pull request #42883 from rallytime/fix-boto-tests ... Fix failing boto tests	2017-08-11 15:29:11 -05:00
rallytime	29ff19c587	Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/config/__init__.py - salt/states/dockerng.py - salt/utils/cloud.py	2017-08-11 15:17:19 -04:00
Nicole Thomas	b21778efac	Merge pull request #42885 from terminalmage/fix-f26-tests ... Move weird tearDown test to an actual tearDown	2017-08-11 15:14:41 -04:00
Nicole Thomas	c15d0034fe	Merge pull request #41977 from redmatter/fix-dockerng-network-ignores-test ... Fix dockerng.network_* ignoring of tests=True	2017-08-11 14:37:19 -04:00
Nicole Thomas	3b9c3c5671	Merge pull request #42886 from sarcasticadmin/adding_docs_salt_outputs ... Adding missing output flags to salt cli docs	2017-08-11 14:35:18 -04:00
garethgreenaway	9868ab6f3b	Merge pull request #42887 from rallytime/fix-42870 ... Remove extraneous "deprecated" notation	2017-08-11 11:34:24 -07:00
rallytime	71e7581a2d	Remove extraneous "deprecated" notation ... This deprecated notation was supposed to be on the "useradd_all" function, but somehow was moved to the "useradd" function. Fixes #42870	2017-08-11 14:31:17 -04:00
rallytime	6a7bf99848	Lint fix: add missing space	2017-08-11 14:19:15 -04:00
Nicole Thomas	e5b98c8a88	Merge pull request #42882 from gtmanfred/2016.11 ... make sure cmd is not run when npm isn't installed	2017-08-11 13:53:14 -04:00
Nicole Thomas	da71f2a11b	Merge pull request #42881 from gtmanfred/vmware ... fix vmware for python 3.4.2 in salt.utils.vmware	2017-08-11 13:52:29 -04:00
Erik Johnson	462d653082	Move weird tearDown test to an actual tearDown ... Also catch KeyError when user doesn't exist	2017-08-11 12:20:50 -05:00
Daniel Wallace	da3402a53d	make sure cmd is not run when npm isn't installed ... apparently the skipIf on the functions still get run, even if the function is going to be skipped based on a skipIf on the class.	2017-08-11 10:58:00 -06:00
rallytime	43643227c6	Skip 2 failing tests in Python 3 due to upstream bugs	2017-08-11 12:57:39 -04:00
Daniel Wallace	05ecc6ac8d	fix vmware for python 3.4.2 in salt.utils.vmware	2017-08-11 10:14:38 -06:00
Nicole Thomas	5962c9588b	Merge pull request #42788 from amendlik/saltify-timeout ... Remove waits and retries from Saltify deployment	2017-08-11 11:38:05 -04:00
Nicole Thomas	227ecddd13	Merge pull request #42877 from terminalmage/add-cron-state-virtual ... Add virtual func for cron state module	2017-08-11 11:33:09 -04:00
Nicole Thomas	ab9f6cef33	Merge pull request #42859 from terminalmage/gitpython-git-cli-note ... Add note about git CLI requirement for GitPython to GitFS tutorial	2017-08-11 10:53:02 -04:00
Nicole Thomas	c7750d5717	Merge pull request #42845 from brejoc/updates-for-kubernetes-2.0.0 ... API changes for Kubernetes version 2.0.0	2017-08-11 10:04:30 -04:00
Nicole Thomas	459fdedc67	Merge pull request #42678 from frankiexyz/2017.7 ... Add eos.rst in the installation guide	2017-08-11 09:58:36 -04:00
Nicole Thomas	4ce96eb1a1	Merge pull request #42778 from gtmanfred/spm ... make sure to use the correct out_file	2017-08-11 09:44:47 -04:00
Nicole Thomas	682b4a8d14	Merge pull request #42856 from gtmanfred/2016.11 ... skip cache_clean test if npm version is >= 5.0.0	2017-08-11 09:39:19 -04:00
Nicole Thomas	3d05d89e09	Merge pull request #42857 from gtmanfred/vmware ... use older name if _create_unverified_context is unvailable	2017-08-11 09:37:58 -04:00
Erik Johnson	f1de196740	Add virtual func for cron state module ... This prevents a traceback when you attempt to use a cron state without cron being installed.	2017-08-11 08:32:19 -05:00
Nicole Thomas	01ea854029	Merge pull request #42864 from whiteinge/syndic-log-root_dir ... Make syndic_log_file respect root_dir setting	2017-08-11 09:28:21 -04:00
Nicole Thomas	7e8cfff21c	Merge pull request #42866 from twangboy/osx_downgrade_gitpython ... Change to GitPython version 2.1.1	2017-08-11 09:23:51 -04:00
Jochen Breuer	81674aa88a	Version info in :optdepends: not needed anymore ... Since this should work with 1.x.x and 2.x.x we don't have to provide a ersion info.	2017-08-11 11:20:42 +02:00
Jochen Breuer	71995505bc	Not depending on specific K8s version anymore ... Kubernetes imports are no longer version specific. Seems like the API change was just a rename, so now we are importing either `V1beta1Deployment` or `AppsV1beta1Deployment`. Usage stays the same.	2017-08-11 08:57:03 +02:00
twangboy	28053a84a6	Change GitPython version to 2.1.1 ... Version 2.1.4+ requires git to be installed, usually in the form of xcode command line tools. 2.1.3 has a memory leak problem, 2.1.2 is not available. So that leaves 2.1.1.	2017-08-10 17:39:58 -06:00
Seth House	4b1f55da9c	Make syndic_log_file respect root_dir setting	2017-08-10 17:06:49 -06:00
Erik Johnson	35e05c9515	Add note about git CLI requirement for GitPython to GitFS tutorial	2017-08-10 16:47:47 -05:00
Nicole Thomas	3ce18637be	Merge pull request #42855 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2016.11 to 2017.7	2017-08-10 17:40:38 -04:00
rallytime	7f46603e9c	Update account id value in boto_secgroup module unit test ... This value was updated in moto 1.0.0 with the following commit: 5f3fbff627	2017-08-10 17:31:14 -04:00
rallytime	7c1d493fdd	@mock_elb needs to be changed to @mock_elb_deprecated as well	2017-08-10 17:15:45 -04:00
Daniel Wallace	c1f673eca4	use older name if _create_unverified_context is unvailable	2017-08-10 14:43:33 -06:00
rallytime	3055e17ed5	Replace @mock_ec2 calls with @mock_ec2_deprecated calls ... moto versions >= 1.0.0 have changed the way the mocked connections through boto are handled with the @mock_ec2 decorator. They use the boto3 connection method. However, since we are still using boto in many places, we need to use the new @mock_ec2_deprecated decorator instead to handle the boto connection functions for the unit tests. Versions of moto < 1.0.0 are not Python 3 compatible, so salt-jenkins should be installing newer versions of moto for those tests. Unfortunately, we cannot install an older version of moto for Python2 that use the original @mock_ec2 call and also import the @mock_ec2_deprecated function for newer versions of moto simultaneously as the @mock_ec2_deprecated function doesn't exist in older versions of moto.	2017-08-10 16:40:11 -04:00
Robert James Hernandez	744bf954ff	Adding missing output flags to salt cli	2017-08-10 13:19:08 -07:00
Daniel Wallace	b458b89fb8	skip cache_clean test if npm version is >= 5.0.0	2017-08-10 14:17:47 -06:00
rallytime	08bbcf5790	Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/modules/win_pkg.py	2017-08-10 14:51:27 -04:00
Nicole Thomas	2dde1f77e9	Merge pull request #42851 from terminalmage/bp-42651 ... Backport #42651 to 2016.11	2017-08-10 14:02:38 -04:00
Daniel Wallace	a3da86eea8	fix syntax	2017-08-10 11:08:27 -05:00
Daniel Wallace	6ecdbcec1d	make sure names are correct	2017-08-10 11:08:26 -05:00
Daniel Wallace	f83b553d6e	add py3 for versionlock	2017-08-10 11:08:26 -05:00
Daniel Wallace	21934f61bb	python2- prefix for fedora 26 packages	2017-08-10 11:08:25 -05:00
Nicole Thomas	f954f4f33a	Merge pull request #42808 from terminalmage/issue42774 ... Fix regression in yum/dnf version specification	2017-08-10 11:59:22 -04:00
Jochen Breuer	d8f7d7a7c0	API changes for Kubernetes version 2.0.0 ... Switching to the new Kubernetes client lib API introduced with version 2.0.0.	2017-08-10 16:35:45 +02:00