90933 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	ece4452953	Merge pull request #45078 from aphor/macports ... update macports doc, portfile	2018-02-15 14:17:33 -05:00
Nicole Thomas	c02cb3394c	Merge pull request #45769 from Zero-Down-Time/develop ... Surpress boto WARNING during SQS msg decode in sqs_engine	2018-02-15 14:14:31 -05:00
Nicole Thomas	907c179535	Merge pull request #45537 from mitodl/develop ... Added the option to explicitly specify the user for django commands	2018-02-15 13:52:08 -05:00
Nicole Thomas	3bed490983	Merge pull request #46043 from edgan/zookeeper-znode-fix ... Allow zookeeper znode creation to not require an ACL	2018-02-15 12:45:45 -05:00
Tobias Macey	21774a2395	Added the option to explicitly specify the user for django commands ... Being able to specify the user to run django commands as can help to prevent permissions issues from cropping up, such as when compiling static assets or migrating a sqlite database which are then owned by root.	2018-02-15 09:03:02 -05:00
Nathan Grennan	2af846719e	Allow zookeeper znode creation to not require an ACL	2018-02-14 15:04:10 -08:00
Nicole Thomas	e9af12cfbf	Merge branch 'develop' into develop	2018-02-13 16:52:43 -05:00
Nicole Thomas	a501c19085	Merge pull request #44904 from Jac2NL/develop ... Update CLI examples in state.py documentation	2018-02-13 12:47:11 -05:00
Nicole Thomas	8ff7d70199	Merge pull request #45785 from oarmstrong/develop ... m/selinux.fcontext_get_policy allow long filespecs	2018-02-13 12:40:50 -05:00
Nicole Thomas	179b477d9b	Merge pull request #45966 from alekseiplotnikov/postgres_groups_optimization ... Optimize postgres groups management	2018-02-13 12:37:25 -05:00
Nicole Thomas	c0fe4bc4f4	Merge pull request #45826 from philpep/patch-1 ... Fix selinux.fcontext_policy_present for Centos 6	2018-02-13 12:35:06 -05:00
Nicole Thomas	63722b215f	Merge pull request #45965 from rjc/patch-1 ... Simplify firewall rules	2018-02-13 12:30:23 -05:00
Nicole Thomas	99c0c5316e	Merge pull request #45462 from aphor/issues/45413 ... emit port cli version, variants as separate args	2018-02-13 11:23:44 -05:00
Nicole Thomas	dc80e2cb57	Merge pull request #45797 from L4rS6/aliases-symlink-fix ... follow symlinks in aliases module (close #45796)	2018-02-12 17:12:44 -05:00
Nicole Thomas	fd50149e82	Merge branch 'develop' into issues/45413	2018-02-12 17:04:05 -05:00
Nicole Thomas	fb12aee6d2	Merge pull request #45815 from nullify005/route53-fixes ... Route53 AliasTarget and Infinite loop fixes	2018-02-12 16:51:55 -05:00
Nicole Thomas	e7daf539e6	Merge branch 'develop' into aliases-symlink-fix	2018-02-12 11:51:30 -05:00
Lee Webb	49accc9860	review feedback	2018-02-12 09:46:48 +11:00
Aleksei Plotnikov	90c49f5851	Merge branch 'develop' into postgres_groups_optimization	2018-02-11 01:26:35 +02:00
rjc	c758ed9132	Simplify firewall rules ... As with `firewall-cmd`, use a single rule for ports in both, the `iptables` and `pf` examples. BTW, there's no need for `-m mport` or `-m multiport` (and these might not even be available if not compiled) for `iptables` or using a list or a macro in `pf.conf` if a contiguous range is being used - essentially, use colon ('`:`') for simplicity and consistency.	2018-02-10 06:28:30 +00:00
Nicole Thomas	94aaa5bb28	Merge pull request #45896 from rallytime/boto-utils-docs ... Simple doc fixes for boto utils module	2018-02-09 17:31:34 -05:00
Nicole Thomas	d4b358074e	Merge pull request #45897 from rallytime/boto-apigateway-docs ... Document what versions of dependencies are needed for boto_apigateway module	2018-02-09 17:31:08 -05:00
Ollie Armstrong	f8b8e072f6	Resolve linting errors	2018-02-09 14:09:17 +00:00
Nicole Thomas	78fed2df0b	Merge pull request #45933 from cspeidel/patch-2 ... Minor typo	2018-02-08 16:54:53 -05:00
Nicole Thomas	667b6f40ac	Merge pull request #45930 from sdodsley/purefa_doc_fix_develop ... Fix documentation in snap_eradicate function (purefa module) - DEVELOP branch	2018-02-08 16:53:13 -05:00
cspeidel	6ba45393fb	Update netconfig.py	2018-02-08 14:12:05 -07:00
cspeidel	891825d3be	Minor typo	2018-02-08 14:10:06 -07:00
Simon Dodsley	1a40f4d333	Fix documentation in snap_eradicate function (purefa module)	2018-02-08 14:56:30 -05:00
Nicole Thomas	0274a0a5e1	Merge pull request #45923 from rallytime/merge-develop ... [develop] Merge forward from oxygen to develop	2018-02-08 14:27:29 -05:00
Nicole Thomas	c59005ff9e	Merge pull request #45921 from terminalmage/yumpkg-upgrade_available ... yumpkg: Pass through kwargs from upgrade_available to latest_version	2018-02-08 13:56:23 -05:00
Nicole Thomas	b0aa3c8a5b	Merge pull request #45887 from rallytime/fix-zfs-tests ... Remove special handling for PY2 escape function in zfs module	2018-02-08 13:49:19 -05:00
Aleksei Plotnikov	075e0e60c1	Optimize postgres groups management ... Use single SQL query to fetch all roles. Fixes #34734 and #35070. Also fixes issue with nologin roles being added to groups every time Salt is run.	2018-02-08 19:26:57 +02:00
rallytime	255cc7ffb0	Merge branch 'oxygen' into 'develop' ... No conflicts.	2018-02-08 11:24:56 -05:00
Erik Johnson	9adc7d8893	yumpkg: Pass through kwargs from upgrade_available to latest_version ... The upgrade_available func is there as a convenience for people who are used to the yum/dnf syntax. However, it doesn't pass through kwargs and thus does not support the repo options that latest_version does. This commit makes the simple tweak of passing through the kwargs, allowing this convenience func to support all the extended options that latest_version does.	2018-02-08 09:37:07 -06:00
Nicole Thomas	621584a8e0	Merge pull request #45605 from ogd-software/boto_iam_role-fix_pseudo_deepdiff ... Boto iam role fix pseudo deepdiff	2018-02-08 09:38:43 -05:00
Nicole Thomas	f20b96c9e9	Merge branch 'develop' into patch-1	2018-02-08 09:24:59 -05:00
Nicole Thomas	1292c4f6dd	Merge pull request #45880 from anttipalsola/include-dn-in-pillar_ldap-results ... pillar_ldap: Include distinguished names in results	2018-02-08 09:07:09 -05:00
Nicole Thomas	ac308d15a8	Merge branch 'develop' into aliases-symlink-fix	2018-02-08 08:42:33 -05:00
Nicole Thomas	048c18ea42	Merge pull request #45861 from rallytime/merge-oxygen ... [oxygen] Merge forward from oxygen.rc1 to oxygen	2018-02-08 08:39:58 -05:00
Herbert Buurman	34e6c2e933	salt/states/boto_iam_role.py: Removed duplicate code detected by CodeClimate.	2018-02-08 12:28:35 +01:00
Herbert Buurman	fd804cfce4	salt/states/boto_iam_role.py: Reinstated _sort_policy with added support for OrderedDict.	2018-02-08 09:54:27 +01:00
Herbert Buurman	9e2d76133b	Merge branch 'develop' into boto_iam_role-fix_pseudo_deepdiff	2018-02-08 09:43:21 +01:00
Gareth J. Greenaway	34cc7f005f	Merge pull request #45879 from rallytime/stale-config-update ... Reduce the number of days an issue is stale by 10	2018-02-07 12:45:33 -08:00
Nicole Thomas	590eb14b11	Merge pull request #45898 from cspeidel/patch-1 ... Update cisconso.py docstring	2018-02-07 14:10:56 -05:00
Nicole Thomas	b22f706cb8	Merge pull request #45894 from while0pass/fix ... Fix inconcistencies in param description	2018-02-07 14:10:22 -05:00
Ollie Armstrong	b2d5227c27	Remove unused import	2018-02-07 18:33:37 +00:00
Ollie Armstrong	5c0fcfdfb6	Add tests for salt.modules.selinux.fcontext_get_policy	2018-02-07 18:29:36 +00:00
Ollie Armstrong	3433d27252	Ensure parsed fields are stripped	2018-02-07 18:29:31 +00:00
Ollie Armstrong	21aa8284ba	m/selinux.fcontext_get_policy allow long filespecs ... The previous logic of matching the output of `semanage fcontext --list` did not allow for filespecs that were longer than 49 characters. This was due to the output of the semanage tool not conforming to the expected output. We used to expect that the after the filespec would be at least two spaces. However, with long filespecs there is only a single space separating it and the next field (the file type). This modifies the regular expression that we use to match the line to accept one or more spaces as field delimeters. However, this causes problems when we attempt to split the three fields into a python dictionary. We cannot use the same logic as previously of using the field delimeter as the file type field itself can contain a space. Instead we use a separate regular expression to parse the line into its component parts. Fixes #45784.	2018-02-07 18:29:25 +00:00
rallytime	dfb74b0aa9	Add dep list for boto_apigateway state	2018-02-07 11:21:18 -05:00