91676 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gareth J. Greenaway	2a68fa968e	Couple lint fixes.	2018-03-05 14:54:00 -08:00
Gareth J. Greenaway	abeb2bc143	Fixing test_search_keys. Gating tests to ensure GPG module is available.	2018-03-05 14:54:00 -08:00
Gareth J. Greenaway	0eba7ca9b1	Fixing test.	2018-03-05 14:53:59 -08:00
Gareth J. Greenaway	a9fb0c7a58	removing unused test.	2018-03-05 14:53:59 -08:00
Gareth J. Greenaway	6636f63c15	Initial addition of some unit tests for gpg module.	2018-03-05 14:53:59 -08:00
Nicole Thomas	05d4d104d2	Merge pull request #46196 from mthibaut/issue_46189 ... Fix for issue #46189.	2018-03-05 16:54:09 -05:00
Nicole Thomas	39442c617c	Merge pull request #45231 from obeleh/compose_services ... Compose services	2018-03-05 16:53:30 -05:00
Nicole Thomas	74c5c32e7c	Merge pull request #46058 from brad-alexander/patch-1 ... Properly remove package folder from modules	2018-03-05 15:06:28 -05:00
Nicole Thomas	ed1108a393	Merge pull request #46222 from spenceation/cimc-update ... Added new functions to CIMC modules	2018-03-05 14:44:17 -05:00
Nicole Thomas	a3ad308457	Merge pull request #46263 from terminalmage/issue46212 ... Add setopt support to yumpkg (and pkg.installed state)	2018-03-05 14:43:19 -05:00
Nicole Thomas	6bb0a310f9	Merge pull request #46304 from garethgreenaway/quick_fix_scheduler_unit_tests ... [develop] quick fix to unit.utils.test_schedule.ScheduleTestCase.test_eval_schedule_time_eval	2018-03-05 14:40:26 -05:00
Nicole Thomas	c99dbd8371	Merge pull request #45730 from mchugh19/state.exists ... RFC: create state.exists	2018-03-05 14:38:39 -05:00
Sjuul Janssen	ad55318341	Merge branch 'develop' into compose_services	2018-03-05 18:48:48 +01:00
Nicole Thomas	e34bb4ac96	Merge branch 'develop' into issue_46189	2018-03-05 12:16:39 -05:00
sjuul	503b72a8d1	removed spaces	2018-03-05 18:03:11 +01:00
Nicole Thomas	8ec1c6699b	Merge branch 'develop' into state.exists	2018-03-05 10:38:21 -05:00
Nicole Thomas	de308848f9	Merge pull request #46321 from amendlik/pkgng-upgrade ... Account for output variations in pkgng._parse_upgrade	2018-03-05 10:30:16 -05:00
Nicole Thomas	812f6d8ef5	Merge pull request #46164 from garethgreenaway/add_grains_timezone ... [develop] Adding a timezone to grains locale_info	2018-03-05 09:54:57 -05:00
Nicole Thomas	23e126f84c	Merge pull request #46325 from tokiwinter/fix_hash_comment ... Fix encryption algorithm hash id in comment	2018-03-05 09:35:28 -05:00
Nicole Thomas	5a49cf2ed2	Merge pull request #46300 from gclinch/debconfmod-py3 ... Python 3 support for debconfmod (fixes #46299)	2018-03-05 09:15:59 -05:00
Toki Winter	b8918b331b	Fix hash id in comment	2018-03-05 15:50:49 +11:00
Erik Johnson	58afd8fc49	Merge pull request #46176 from The-Loeki/docker-prune ... Add docker.prune - pruning for Docker subsystems	2018-03-03 15:21:32 -06:00
Adam Mendlik	26322e990a	Account for output variations in pkgng._parse_upgrade	2018-03-03 11:48:10 -07:00
Ronald van Zantvoort	47f82c6f39	Merge branch 'develop' into docker-prune	2018-03-03 18:52:30 +01:00
Ronald van Zantvoort	e60a68884c	Merge pull request #1 from terminalmage/pr-46176 ... Bugfixes, tweaks, tests for docker.prune	2018-03-03 15:40:21 +01:00
Erik Johnson	e8b940242c	Add unit test for docker.prune	2018-03-03 01:47:00 -06:00
Erik Johnson	6ac96ac416	Bugfixes, tweaks for docker.prune ... The kwargs argument isn't supported and attempting to pass it to the API will result in API errors. This fixes that bug and makes improvements to the docstring. It also changes the behavior of the `system` argument so that it doesn't need to be manually disabled to prune only containers/images/etc. Finally, it moves the prune function higher up to fit with the organizational structure of the module.	2018-03-03 01:46:34 -06:00
Gareth J. Greenaway	15ca7a21c2	Fixing merge conflict.	2018-03-02 14:20:32 -08:00
Nicole Thomas	5f88d64dc0	Merge pull request #46186 from nicholasmhughes/add-additional-azurearm-modules ... Add Additional Azure ARM Modules	2018-03-02 16:49:07 -05:00
Nicole Thomas	218c2af39d	Merge pull request #46197 from terminalmage/split-input-map ... Add mapper to salt.utils.args.split_input()	2018-03-02 16:48:17 -05:00
Nicole Thomas	b7414d822d	Merge pull request #46229 from smarsching/svn-trust-failures ... Add trust_failures option to svn.export and svn.latest.	2018-03-02 16:45:41 -05:00
Nicole Thomas	d1d966abc7	Merge pull request #46302 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-03-02 16:27:45 -05:00
spenceation	0430cd0697	Fixed lint issue.	2018-03-02 14:09:18 -05:00
Nicole Thomas	f5ff692cfc	Merge pull request #46303 from Ch3LL/rc_docs ... Update releasecandidate doc for 2018.3.0rc1	2018-03-02 13:42:03 -05:00
Ch3LL	52a68450ae	Update releasecandidate doc for 2018.3.0rc1	2018-03-02 12:02:21 -05:00
rallytime	ed46ce3c74	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/auth/ldap.py - salt/modules/zfs.py - salt/modules/zpool.py - salt/states/cmd.py - salt/utils/schedule.py - tests/integration/scheduler/test_eval.py - tests/integration/scheduler/test_postpone.py - tests/unit/grains/test_core.py	2018-03-02 11:55:06 -05:00
Nicole Thomas	28152ff98d	Merge pull request #46142 from garethgreenaway/port_46084_develop ... [develop] Porting various scheduler fixes from Oxygen to develop	2018-03-02 11:39:49 -05:00
Graham Clinch	d59fd8ff62	Python 3 support	2018-03-02 16:38:08 +00:00
Gareth J. Greenaway	5fe32a9fb3	Fixing a couple typos. Adding missing job name variable into functions that use it in error reporting. Fixing up various strings used in error reporting and logging.	2018-03-01 16:02:22 -08:00
Gareth J. Greenaway	701c7f90b4	Include PR https://github.com/saltstack/salt/pull/46267	2018-03-01 16:02:22 -08:00
Gareth J. Greenaway	4f24c546e3	Include https://github.com/saltstack/salt/pull/46190	2018-03-01 16:02:22 -08:00
Gareth J. Greenaway	cde50c6dab	Fixing lint	2018-03-01 16:02:21 -08:00
Gareth J. Greenaway	2aa9a84b28	Adding changes from #45323	2018-03-01 16:02:21 -08:00
Gareth J. Greenaway	65561441e5	Add changes from PR #46143 to develop	2018-03-01 16:02:21 -08:00
Gareth J. Greenaway	e23da417d5	Fixing a couple typos. Converting the code to handle after & until to sub functions.	2018-03-01 16:02:21 -08:00
Gareth J. Greenaway	dcc5deaea5	Porting #46084 to Develop	2018-03-01 16:02:21 -08:00
Nicole Thomas	7731ffae20	Merge pull request #46289 from rallytime/update-release-notes ... Port 2018.3.0.rst release note changes to develop	2018-03-01 17:12:08 -05:00
Sebastian Marsching	fe8c5ea1d5	Add trust_failures option to svn.export and svn.latest. ... If set, the value of this option is passed to svn using the --trust-server-cert-failures option. This is useful for cases where using the --trust-server-cert option (as enabled by the trust option of the states) is not sufficient. One example of such a case is when the host name of the SVN server does not match the name in the certificate.	2018-03-01 22:26:14 +01:00
Nicole Thomas	4df31ac297	Merge pull request #46248 from garethgreenaway/45325_display_usage_for_runners ... [develop] display usage for runners when missing arguments	2018-03-01 14:44:18 -05:00
rallytime	18eca3da3b	Port 2018.3.0.rst release note changes to develop	2018-03-01 14:24:10 -05:00